openstack
/
cookbook-openstack-compute
Code Issues Proposed changes

Merge "make vnc listen on local bind IP"

This commit is contained in:
Jenkins 2014-05-05 22:38:37 +00:00 committed by Gerrit Code Review
parent cfa0625db1 0781188f2a
commit 3c5e142665
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
recipes/nova-common.rb
View File

@ -78,7 +78,7 @@ xvpvnc_endpoint = endpoint 'compute-xvpvnc' || {}
xvpvnc_bind = endpoint 'compute-xvpvnc-bind' || {}
novnc_endpoint = endpoint 'compute-novnc' || {}
novnc_bind = endpoint 'compute-novnc-bind' || {}
vnc_endpoint = endpoint 'compute-vnc' || {}
vnc_bind = endpoint 'compute-vnc-bind' || {}
compute_api_bind = endpoint 'compute-api-bind' || {}
compute_api_endpoint = endpoint 'compute-api' || {}
ec2_api_bind = endpoint 'compute-ec2-api-bind' || {}
@ -121,8 +121,8 @@ template '/etc/nova/nova.conf' do
xvpvncproxy_bind_port: xvpvnc_bind.port,
novncproxy_bind_host: novnc_bind.host,
novncproxy_bind_port: novnc_bind.port,
vncserver_listen: vnc_endpoint.host,
vncserver_proxyclient_address: vnc_endpoint.host,
vncserver_listen: vnc_bind.host,
vncserver_proxyclient_address: vnc_bind.host,
memcache_servers: memcache_servers,
mq_service_type: mq_service_type,
mq_password: mq_password,

2
spec/nova-common_spec.rb
View File

@ -185,7 +185,7 @@ describe 'openstack-compute::nova-common' do
end
it 'has default vncserver_* options set' do
node.set['openstack']['endpoints']['compute-vnc']['bind_interface'] = 'lo'
node.set['openstack']['endpoints']['compute-vnc-bind']['bind_interface'] = 'lo'
[/^vncserver_listen=127.0.1.1$/,
/^vncserver_proxyclient_address=127.0.1.1$/].each do |line|