From 73f4c6615414b2931d674ab46c49133cafc5bbfe Mon Sep 17 00:00:00 2001 From: Pavel Glushchak Date: Wed, 26 Apr 2017 13:51:02 +0300 Subject: [PATCH] Don't configure novncproxy_base_url on controller This parameter is only consumed by nova-compute. In packstack this causes problem, when compute and controller are located on the same node and this parameter is set to: http://0.0.0.0:6080/vnc_auto.html Thus this compute node returns incorrect novnc url. Change-Id: I03c6329d805081cfc29aa640bbacbdba2c899422 Signed-off-by: Pavel Glushchak --- manifests/vncproxy.pp | 2 -- .../notes/novncproxy_base_url-ec29bb6c3092a43b.yaml | 9 +++++++++ spec/classes/nova_vnc_proxy_spec.rb | 7 ------- 3 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 releasenotes/notes/novncproxy_base_url-ec29bb6c3092a43b.yaml diff --git a/manifests/vncproxy.pp b/manifests/vncproxy.pp index 39d350270..23b102ffe 100644 --- a/manifests/vncproxy.pp +++ b/manifests/vncproxy.pp @@ -51,8 +51,6 @@ class nova::vncproxy( 'vnc/novncproxy_port': value => $port; } - include ::nova::vncproxy::common - nova::generic_service { 'vncproxy': enabled => $enabled, manage_service => $manage_service, diff --git a/releasenotes/notes/novncproxy_base_url-ec29bb6c3092a43b.yaml b/releasenotes/notes/novncproxy_base_url-ec29bb6c3092a43b.yaml new file mode 100644 index 000000000..20df9c386 --- /dev/null +++ b/releasenotes/notes/novncproxy_base_url-ec29bb6c3092a43b.yaml @@ -0,0 +1,9 @@ +--- +fixes: + - | + novncproxy_base_url parameter is only consumed by nova-compute. Thus it should + not be configured on controller node, where novnc proxy service runs. In packstack + deployment it causes problem when controller and compute are configured on the + same node and novncproxy_base_url is set to `http://0.0.0.0:6080/vnc_auto.html`. + In this case nova will return incorrect novnc url for instances, that run on such + compute node. diff --git a/spec/classes/nova_vnc_proxy_spec.rb b/spec/classes/nova_vnc_proxy_spec.rb index c8fc71148..a73930521 100644 --- a/spec/classes/nova_vnc_proxy_spec.rb +++ b/spec/classes/nova_vnc_proxy_spec.rb @@ -15,7 +15,6 @@ describe 'nova::vncproxy' do it { is_expected.to contain_nova_config('vnc/novncproxy_host').with(:value => '0.0.0.0') } it { is_expected.to contain_nova_config('vnc/novncproxy_port').with(:value => '6080') } - it { is_expected.to contain_nova_config('vnc/novncproxy_base_url').with(:value => 'http://0.0.0.0:6080/vnc_auto.html') } it { is_expected.to contain_package('nova-vncproxy').with( :name => 'nova-novncproxy', @@ -95,10 +94,4 @@ describe 'nova::vncproxy' do end - describe 'Support IPv6' do - let(:facts) { @default_facts.merge({ :osfamily => 'Debian'}) } - let(:params) { { :host => '2001::1' } } - it { is_expected.to contain_nova_config('vnc/novncproxy_base_url').with(:value => 'http://[2001::1]:6080/vnc_auto.html') } - end - end