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 <pglushchak@virtuozzo.com>
This commit is contained in:
@@ -51,8 +51,6 @@ class nova::vncproxy(
|
|||||||
'vnc/novncproxy_port': value => $port;
|
'vnc/novncproxy_port': value => $port;
|
||||||
}
|
}
|
||||||
|
|
||||||
include ::nova::vncproxy::common
|
|
||||||
|
|
||||||
nova::generic_service { 'vncproxy':
|
nova::generic_service { 'vncproxy':
|
||||||
enabled => $enabled,
|
enabled => $enabled,
|
||||||
manage_service => $manage_service,
|
manage_service => $manage_service,
|
||||||
|
@@ -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.
|
@@ -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_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_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(
|
it { is_expected.to contain_package('nova-vncproxy').with(
|
||||||
:name => 'nova-novncproxy',
|
:name => 'nova-novncproxy',
|
||||||
@@ -95,10 +94,4 @@ describe 'nova::vncproxy' do
|
|||||||
|
|
||||||
end
|
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
|
end
|
||||||
|
Reference in New Issue
Block a user