Merge "make vnc listen on local bind IP"
This commit is contained in:
commit
3c5e142665
|
@ -78,7 +78,7 @@ xvpvnc_endpoint = endpoint 'compute-xvpvnc' || {}
|
||||||
xvpvnc_bind = endpoint 'compute-xvpvnc-bind' || {}
|
xvpvnc_bind = endpoint 'compute-xvpvnc-bind' || {}
|
||||||
novnc_endpoint = endpoint 'compute-novnc' || {}
|
novnc_endpoint = endpoint 'compute-novnc' || {}
|
||||||
novnc_bind = endpoint 'compute-novnc-bind' || {}
|
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_bind = endpoint 'compute-api-bind' || {}
|
||||||
compute_api_endpoint = endpoint 'compute-api' || {}
|
compute_api_endpoint = endpoint 'compute-api' || {}
|
||||||
ec2_api_bind = endpoint 'compute-ec2-api-bind' || {}
|
ec2_api_bind = endpoint 'compute-ec2-api-bind' || {}
|
||||||
|
@ -121,8 +121,8 @@ template '/etc/nova/nova.conf' do
|
||||||
xvpvncproxy_bind_port: xvpvnc_bind.port,
|
xvpvncproxy_bind_port: xvpvnc_bind.port,
|
||||||
novncproxy_bind_host: novnc_bind.host,
|
novncproxy_bind_host: novnc_bind.host,
|
||||||
novncproxy_bind_port: novnc_bind.port,
|
novncproxy_bind_port: novnc_bind.port,
|
||||||
vncserver_listen: vnc_endpoint.host,
|
vncserver_listen: vnc_bind.host,
|
||||||
vncserver_proxyclient_address: vnc_endpoint.host,
|
vncserver_proxyclient_address: vnc_bind.host,
|
||||||
memcache_servers: memcache_servers,
|
memcache_servers: memcache_servers,
|
||||||
mq_service_type: mq_service_type,
|
mq_service_type: mq_service_type,
|
||||||
mq_password: mq_password,
|
mq_password: mq_password,
|
||||||
|
|
|
@ -185,7 +185,7 @@ describe 'openstack-compute::nova-common' do
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'has default vncserver_* options set' do
|
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_listen=127.0.1.1$/,
|
||||||
/^vncserver_proxyclient_address=127.0.1.1$/].each do |line|
|
/^vncserver_proxyclient_address=127.0.1.1$/].each do |line|
|
||||||
|
|
Loading…
Reference in New Issue