Merge "Do not test nova::migration::libvirt in 2 places"
This commit is contained in:
commit
5ac0e1dd76
@ -213,7 +213,6 @@ describe 'nova::compute::libvirt' do
|
||||
|
||||
it { is_expected.to contain_class('nova::migration::libvirt')}
|
||||
it { is_expected.to contain_nova_config('vnc/server_listen').with_value('0.0.0.0')}
|
||||
it { is_expected.to contain_file_line('/etc/default/libvirtd libvirtd opts').with(:line => libvirt_options) }
|
||||
end
|
||||
|
||||
context 'with vncserver_listen set to ::0' do
|
||||
@ -224,17 +223,6 @@ describe 'nova::compute::libvirt' do
|
||||
|
||||
it { is_expected.to contain_class('nova::migration::libvirt')}
|
||||
it { is_expected.to contain_nova_config('vnc/server_listen').with_value('::0')}
|
||||
it { is_expected.to contain_file_line('/etc/default/libvirtd libvirtd opts').with(:line => libvirt_options) }
|
||||
end
|
||||
|
||||
context 'with custom libvirt service name on Debian platforms' do
|
||||
let :params do
|
||||
{ :libvirt_service_name => 'libvirtd',
|
||||
:vncserver_listen => '0.0.0.0',
|
||||
:migration_support => true }
|
||||
end
|
||||
it { is_expected.to contain_file_line('/etc/default/libvirtd libvirtd opts').with(:line => libvirt_options) }
|
||||
|
||||
end
|
||||
end
|
||||
|
||||
@ -324,7 +312,6 @@ describe 'nova::compute::libvirt' do
|
||||
|
||||
it { is_expected.to contain_class('nova::migration::libvirt')}
|
||||
it { is_expected.to contain_nova_config('vnc/server_listen').with_value('0.0.0.0')}
|
||||
it { is_expected.to contain_file_line('/etc/sysconfig/libvirtd libvirtd args').with(:line => 'LIBVIRTD_ARGS="--listen"') }
|
||||
end
|
||||
|
||||
context 'with vncserver_listen set to ::0' do
|
||||
@ -335,7 +322,6 @@ describe 'nova::compute::libvirt' do
|
||||
|
||||
it { is_expected.to contain_class('nova::migration::libvirt')}
|
||||
it { is_expected.to contain_nova_config('vnc/server_listen').with_value('::0')}
|
||||
it { is_expected.to contain_file_line('/etc/sysconfig/libvirtd libvirtd args').with(:line => 'LIBVIRTD_ARGS="--listen"') }
|
||||
end
|
||||
|
||||
end
|
||||
|
Loading…
x
Reference in New Issue
Block a user