openstack/cookbook-openstack-compute
Code Issues Proposed changes

Merge pull request #78 from retr0h/vnc-bind

Browse Source 
removed compute-novnc-server endpoint
This commit is contained in:
jaypipes
2013-04-23 13:50:24 -07:00
parent 12948f1667 9e9297ef63
commit 88d00efc35
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
recipes/nova-common.rb
View File

@@ -79,8 +79,7 @@ ksadmin_pass = user_password ksadmin_user
identity_admin_endpoint = endpoint "identity-admin" identity_admin_endpoint = endpoint "identity-admin"
identity_endpoint = endpoint "identity-api" identity_endpoint = endpoint "identity-api"
xvpvnc_endpoint = endpoint "compute-xvpvnc" || {} xvpvnc_endpoint = endpoint "compute-xvpvnc" || {}
novnc_endpoint = endpoint "compute-novnc-server" || {} novnc_endpoint = endpoint "compute-novnc" || {}
novnc_proxy_endpoint = endpoint "compute-novnc"
nova_api_endpoint = endpoint "compute-api" || {} nova_api_endpoint = endpoint "compute-api" || {}
ec2_public_endpoint = endpoint "compute-ec2-api" || {} ec2_public_endpoint = endpoint "compute-ec2-api" || {}
image_endpoint = endpoint "image-api" image_endpoint = endpoint "image-api"
@@ -90,7 +89,6 @@ Chef::Log.debug("nova::nova-common:keystone|#{keystone}")
Chef::Log.debug("nova::nova-common:identity_endpoint|#{identity_endpoint.to_s}") Chef::Log.debug("nova::nova-common:identity_endpoint|#{identity_endpoint.to_s}")
Chef::Log.debug("nova::nova-common:xvpvnc_endpoint|#{xvpvnc_endpoint.to_s}") Chef::Log.debug("nova::nova-common:xvpvnc_endpoint|#{xvpvnc_endpoint.to_s}")
Chef::Log.debug("nova::nova-common:novnc_endpoint|#{novnc_endpoint.to_s}") Chef::Log.debug("nova::nova-common:novnc_endpoint|#{novnc_endpoint.to_s}")
Chef::Log.debug("nova::nova-common:novnc_proxy_endpoint|#{novnc_proxy_endpoint.to_s}")
Chef::Log.debug("nova::nova-common:nova_api_endpoint|#{::URI.decode nova_api_endpoint.to_s}") Chef::Log.debug("nova::nova-common:nova_api_endpoint|#{::URI.decode nova_api_endpoint.to_s}")
Chef::Log.debug("nova::nova-common:ec2_public_endpoint|#{ec2_public_endpoint.to_s}") Chef::Log.debug("nova::nova-common:ec2_public_endpoint|#{ec2_public_endpoint.to_s}")
Chef::Log.debug("nova::nova-common:image_endpoint|#{image_endpoint.to_s}") Chef::Log.debug("nova::nova-common:image_endpoint|#{image_endpoint.to_s}")
@@ -109,9 +107,7 @@ template "/etc/nova/nova.conf" do
:novncproxy_base_url => novnc_endpoint.to_s, :novncproxy_base_url => novnc_endpoint.to_s,
:xvpvncproxy_base_url => xvpvnc_endpoint.to_s, :xvpvncproxy_base_url => xvpvnc_endpoint.to_s,
:xvpvncproxy_bind_host => xvpvnc_proxy_ip, :xvpvncproxy_bind_host => xvpvnc_proxy_ip,
:xvpvncproxy_bind_port => xvpvnc_endpoint.port,
:novncproxy_bind_host => novnc_proxy_ip, :novncproxy_bind_host => novnc_proxy_ip,
:novncproxy_bind_port => novnc_endpoint.port,
:vncserver_listen => vnc_bind_ip, :vncserver_listen => vnc_bind_ip,
:vncserver_proxyclient_address => vnc_bind_ip, :vncserver_proxyclient_address => vnc_bind_ip,
:rabbit_ipaddress => rabbit_info["host"], :rabbit_ipaddress => rabbit_info["host"],