Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #404 from cloudnull/issue915

Merged automatically by jenkins after successful build test
  • Loading branch information...
commit c9cc3f764acae34e5c6b1ca36f23d0d1e9c64f7d 2 parents 172d66c + 60c662d
@rcbjenkins rcbjenkins authored
View
7 README.md
@@ -167,11 +167,6 @@ NOTE: service password is no longer set statically in the attributes file, but s
* `nova["services"]["ec2-public"]["cert_override"]` - For SSL - specify location of custom Cert file
* `nova["services"]["ec2-public"]["key_override"]` - For SSL - specify location of custom Key file
-* `nova["services"]["xvpvnc-proxy"]["scheme"]` - Scheme for xvpvncproxy service service (http/https)
-* `nova["services"]["xvpvnc-proxy"]["network"]` - `osops_networks` network name which service operates on
-* `nova["services"]["xvpvnc-proxy"]["port"]` - Port to bind service to
-* `nova["services"]["xvpvnc-proxy"]["path"]` - URI to use
-
* `nova["services"]["novnc-proxy"]["scheme"]` - Scheme for novncproxy service (http/https)
* `nova["services"]["novnc-proxy"]["network"]` - `osops_networks` network name which service operates on
* `nova["services"]["novnc-proxy"]["port"]` - Port to bind service to
@@ -302,6 +297,8 @@ Author:: Darren Birkett (<darren.birkett@rackspace.co.uk>)
Author:: Evan Callicoat (<evan.callicoat@rackspace.com>)
Author:: Matt Thompson (<matt.thompson@rackspace.co.uk>)
Author:: Andy McCrae (<andrew.mccrae@rackspace.co.uk>)
+Author:: Kevin Carter (<kevin.carter@rackspace.com>)
+
Copyright 2012-2013, Rackspace US, Inc.
View
5 attributes/default.rb
@@ -75,11 +75,6 @@
#default["nova"]["services"]["ec2-public"]["chain_file"] = ""
default["nova"]["services"]["ec2-public"]["wsgi_file"] = "nova-api-ec2"
-default["nova"]["services"]["xvpvnc-proxy"]["scheme"] = "http"
-default["nova"]["services"]["xvpvnc-proxy"]["network"] = "nova"
-default["nova"]["services"]["xvpvnc-proxy"]["port"] = 6081
-default["nova"]["services"]["xvpvnc-proxy"]["path"] = "/console"
-
default["nova"]["services"]["novnc-proxy"]["scheme"] = "http"
default["nova"]["services"]["novnc-proxy"]["network"] = "nova"
default["nova"]["services"]["novnc-proxy"]["port"] = 6080
View
7 providers/conf.rb
@@ -34,9 +34,8 @@
# Get endpoint info for nova-api-ec2
ec2_bind = get_bind_endpoint("nova", "ec2-public")
- # Search for xvpvnc endpoint info
+ # Search for vnc endpoint info
vnc_role = "nova-vncproxy"
- xvpvncproxy_endpoint = get_access_endpoint(vnc_role, "nova", "xvpvnc-proxy")
novncproxy_endpoint = get_access_endpoint(vnc_role, "nova", "novnc-proxy")
# Check novnc-proxy ssl config
@@ -49,7 +48,6 @@
end
# Get bind info for vnc
- xvpvncproxy_bind = get_bind_endpoint("nova", "xvpvnc-proxy")
novncserver_bind = get_bind_endpoint("nova", "novnc-server")
novncproxy_bind = get_bind_endpoint("nova", "novnc-proxy")
@@ -174,11 +172,8 @@
"novnc_proxy_cert" => novnc_proxy_cert,
"novnc_proxy_key" => novnc_proxy_key,
"novncproxy_base_url" => novncproxy_endpoint["uri"],
- "xvpvncproxy_bind_host" => xvpvncproxy_bind["host"],
- "xvpvncproxy_bind_port" => xvpvncproxy_bind["port"],
"novncproxy_bind_host" => novncproxy_bind["host"],
"novncproxy_bind_port" => novncproxy_bind["port"],
- "xvpvncproxy_base_url" => xvpvncproxy_endpoint["uri"],
"rabbit_ipaddress" => rabbit_info["host"],
"rabbit_port" => rabbit_info["port"],
"rabbit_ha_queues" => rabbit_settings["cluster"] ? "True" : "False",
View
8 templates/default/partials/vncproxy-options.partial.erb
@@ -1,11 +1,5 @@
-novncproxy_base_url=<%= @novncproxy_base_url %>
-xvpvncproxy_base_url=<%= @xvpvncproxy_base_url %>
-
-# This is only required on the server running xvpvncproxy
-xvpvncproxy_host=<%= @xvpvncproxy_bind_host %>
-xvpvncproxy_port=<%= @xvpvncproxy_bind_port %>
-
# This is only required on the server running novncproxy
+novncproxy_base_url=<%= @novncproxy_base_url %>
novncproxy_host=<%= @novncproxy_bind_host %>
novncproxy_port=<%= @novncproxy_bind_port %>
<% if @novnc_proxy_cert != "donotset" -%>
Please sign in to comment.
Something went wrong with that request. Please try again.