libvirt: allow any binding for vncserver_listen
This change in Nova:
https://review.openstack.org/#/c/73428/
... means that we no longer need to restrict vncserver_listen parameter
to be configured on a certain binding.
Remove this restriction so deployments can set the compute IP instead of
0.0.0.0.
Closes-Bug: #1660099
Change-Id: I3fa050f94f9c95221bb71e16c70ad9128f8684dc
(cherry picked from commit 1412985743
)
This commit is contained in:
parent
d10301915a
commit
3d31b1a104
|
@ -151,11 +151,7 @@ class nova::compute::libvirt (
|
|||
}
|
||||
|
||||
if $migration_support {
|
||||
if $vncserver_listen != '0.0.0.0' and $vncserver_listen != '::0' {
|
||||
fail('For migration support to work, you MUST set vncserver_listen to \'0.0.0.0\' or \'::0\'')
|
||||
} else {
|
||||
include ::nova::migration::libvirt
|
||||
}
|
||||
include ::nova::migration::libvirt
|
||||
}
|
||||
|
||||
# manage_libvirt_services is here for backward compatibility to support
|
||||
|
|
|
@ -0,0 +1,6 @@
|
|||
---
|
||||
fixes:
|
||||
- Fixes `bug 1660099
|
||||
<https://bugs.launchpad.net/puppet-nova/+bug/1660099>`__ so we don't restrict
|
||||
vncserver_listen to be binded on 0.0.0.0, which has been wrong for long time.
|
||||
Nova allows to bind on any IP and live migration will be supported.
|
|
@ -163,16 +163,6 @@ describe 'nova::compute::libvirt' do
|
|||
it { is_expected.to contain_file_line('/etc/libvirt/libvirtd.conf auth_tcp').with(:line => "auth_tcp = \"none\"") }
|
||||
end
|
||||
|
||||
context 'with vncserver_listen not set to 0.0.0.0' do
|
||||
let :params do
|
||||
{ :vncserver_listen => '127.0.0.1',
|
||||
:migration_support => true }
|
||||
end
|
||||
|
||||
it { expect { is_expected.to contain_class('nova::compute::libvirt') }.to \
|
||||
raise_error(Puppet::Error, /For migration support to work, you MUST set vncserver_listen to '0.0.0.0' or '::0'/) }
|
||||
end
|
||||
|
||||
context 'with custom libvirt service name on Debian platforms' do
|
||||
let :params do
|
||||
{ :libvirt_service_name => 'libvirtd',
|
||||
|
@ -315,15 +305,6 @@ describe 'nova::compute::libvirt' do
|
|||
it { is_expected.to contain_file_line('/etc/libvirt/libvirtd.conf auth_tcp').with(:line => "auth_tcp = \"none\"") }
|
||||
end
|
||||
|
||||
context 'with vncserver_listen not set to 0.0.0.0' do
|
||||
let :params do
|
||||
{ :vncserver_listen => '127.0.0.1',
|
||||
:migration_support => true }
|
||||
end
|
||||
|
||||
it { expect { is_expected.to contain_class('nova::compute::libvirt') }.to \
|
||||
raise_error(Puppet::Error, /For migration support to work, you MUST set vncserver_listen to '0.0.0.0'/) }
|
||||
end
|
||||
end
|
||||
|
||||
describe 'when manage_libvirt_services is set to false' do
|
||||
|
|
Loading…
Reference in New Issue