diff --git a/recipes/nova-common.rb b/recipes/nova-common.rb index 8526465b..b163108f 100644 --- a/recipes/nova-common.rb +++ b/recipes/nova-common.rb @@ -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, diff --git a/spec/nova-common_spec.rb b/spec/nova-common_spec.rb index f1e614f2..40575d72 100644 --- a/spec/nova-common_spec.rb +++ b/spec/nova-common_spec.rb @@ -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|