Nova: Drop unused logic to remove the libvirt default network
This logic is no longer used since we introduced containerized libvirt daemon and would block implementing the same in puppet-nova. Change-Id: Ib67747f68976e3bbce8b0ca3f0cc3747a1163c6b
This commit is contained in:
parent
e3ae207c5b
commit
74fb1e4dfe
|
@ -121,26 +121,6 @@ class tripleo::profile::base::nova::libvirt (
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
# This removal of files in /etc/libvirt/qemu should not happen inside containers
|
|
||||||
# Avoids LP#1819482
|
|
||||||
if $::deployment_type != 'containers' {
|
|
||||||
file { ['/etc/libvirt/qemu/networks/autostart/default.xml',
|
|
||||||
'/etc/libvirt/qemu/networks/default.xml']:
|
|
||||||
ensure => absent,
|
|
||||||
require => Package['libvirt'],
|
|
||||||
before => Service['libvirt'],
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# in case libvirt has been already running before the Puppet run, make
|
|
||||||
# sure the default network is destroyed
|
|
||||||
exec { 'libvirt-default-net-destroy':
|
|
||||||
command => '/usr/bin/virsh net-destroy default',
|
|
||||||
onlyif => '/usr/bin/virsh net-info default | /bin/grep -i "^active:\s*yes"',
|
|
||||||
require => Package['libvirt'],
|
|
||||||
before => Service['libvirt'],
|
|
||||||
}
|
|
||||||
|
|
||||||
include nova::compute::libvirt::qemu
|
include nova::compute::libvirt::qemu
|
||||||
include nova::migration::qemu
|
include nova::migration::qemu
|
||||||
|
|
||||||
|
|
|
@ -49,9 +49,6 @@ eos
|
||||||
is_expected.to_not contain_class('nova::compute::libvirt::virtsecretd')
|
is_expected.to_not contain_class('nova::compute::libvirt::virtsecretd')
|
||||||
is_expected.to_not contain_class('nova::compute::libvirt::virtstoraged')
|
is_expected.to_not contain_class('nova::compute::libvirt::virtstoraged')
|
||||||
is_expected.to_not contain_class('nova::compute::libvirt::services')
|
is_expected.to_not contain_class('nova::compute::libvirt::services')
|
||||||
is_expected.to_not contain_file('/etclibvirt/qemu/networks/autostart/default.xml')
|
|
||||||
is_expected.to_not contain_file('/etclibvirt/qemu/networks/default.xml')
|
|
||||||
is_expected.to_not contain_exec('libvirt-default-net-destroy')
|
|
||||||
is_expected.to_not contain_exec('set libvirt sasl credentials')
|
is_expected.to_not contain_exec('set libvirt sasl credentials')
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
@ -90,9 +87,6 @@ eos
|
||||||
is_expected.to contain_class('nova::compute::libvirt::services')
|
is_expected.to contain_class('nova::compute::libvirt::services')
|
||||||
is_expected.to contain_class('nova::compute::libvirt::qemu')
|
is_expected.to contain_class('nova::compute::libvirt::qemu')
|
||||||
is_expected.to contain_class('nova::migration::qemu')
|
is_expected.to contain_class('nova::migration::qemu')
|
||||||
is_expected.to contain_file('/etc/libvirt/qemu/networks/autostart/default.xml').with_ensure('absent')
|
|
||||||
is_expected.to contain_file('/etc/libvirt/qemu/networks/default.xml').with_ensure('absent')
|
|
||||||
is_expected.to contain_exec('libvirt-default-net-destroy')
|
|
||||||
is_expected.to contain_class('nova::compute::libvirt::config').with_libvirtd_config(
|
is_expected.to contain_class('nova::compute::libvirt::config').with_libvirtd_config(
|
||||||
libvirt_daemon_config_default)
|
libvirt_daemon_config_default)
|
||||||
is_expected.to contain_package('cyrus-sasl-scram')
|
is_expected.to contain_package('cyrus-sasl-scram')
|
||||||
|
@ -138,9 +132,6 @@ eos
|
||||||
is_expected.to contain_class('nova::compute::libvirt::services')
|
is_expected.to contain_class('nova::compute::libvirt::services')
|
||||||
is_expected.to contain_class('nova::compute::libvirt::qemu')
|
is_expected.to contain_class('nova::compute::libvirt::qemu')
|
||||||
is_expected.to contain_class('nova::migration::qemu')
|
is_expected.to contain_class('nova::migration::qemu')
|
||||||
is_expected.to contain_file('/etc/libvirt/qemu/networks/autostart/default.xml').with_ensure('absent')
|
|
||||||
is_expected.to contain_file('/etc/libvirt/qemu/networks/default.xml').with_ensure('absent')
|
|
||||||
is_expected.to contain_exec('libvirt-default-net-destroy')
|
|
||||||
is_expected.to contain_class('nova::compute::libvirt::config').with_virtnodedevd_config(libvirt_daemon_config_default)
|
is_expected.to contain_class('nova::compute::libvirt::config').with_virtnodedevd_config(libvirt_daemon_config_default)
|
||||||
is_expected.to contain_class('nova::compute::libvirt::config').with_virtqemud_config(libvirt_daemon_config_default)
|
is_expected.to contain_class('nova::compute::libvirt::config').with_virtqemud_config(libvirt_daemon_config_default)
|
||||||
is_expected.to contain_class('nova::compute::libvirt::config').with_virtproxyd_config(libvirt_daemon_config_default)
|
is_expected.to contain_class('nova::compute::libvirt::config').with_virtproxyd_config(libvirt_daemon_config_default)
|
||||||
|
@ -186,9 +177,6 @@ eos
|
||||||
is_expected.to_not contain_class('nova::compute::libvirt::virtsecretd')
|
is_expected.to_not contain_class('nova::compute::libvirt::virtsecretd')
|
||||||
is_expected.to_not contain_class('nova::compute::libvirt::virtstoraged')
|
is_expected.to_not contain_class('nova::compute::libvirt::virtstoraged')
|
||||||
is_expected.to contain_class('nova::compute::libvirt::services')
|
is_expected.to contain_class('nova::compute::libvirt::services')
|
||||||
is_expected.to contain_file('/etc/libvirt/qemu/networks/autostart/default.xml').with_ensure('absent')
|
|
||||||
is_expected.to contain_file('/etc/libvirt/qemu/networks/default.xml').with_ensure('absent')
|
|
||||||
is_expected.to contain_exec('libvirt-default-net-destroy')
|
|
||||||
is_expected.to contain_class('nova::compute::libvirt::config').with_libvirtd_config(
|
is_expected.to contain_class('nova::compute::libvirt::config').with_libvirtd_config(
|
||||||
libvirt_daemon_config_default.merge(params[:libvirtd_config]))
|
libvirt_daemon_config_default.merge(params[:libvirtd_config]))
|
||||||
is_expected.to contain_package('cyrus-sasl-scram')
|
is_expected.to contain_package('cyrus-sasl-scram')
|
||||||
|
@ -229,9 +217,6 @@ eos
|
||||||
is_expected.to contain_class('nova::compute::libvirt::services')
|
is_expected.to contain_class('nova::compute::libvirt::services')
|
||||||
is_expected.to contain_class('nova::compute::libvirt::qemu')
|
is_expected.to contain_class('nova::compute::libvirt::qemu')
|
||||||
is_expected.to contain_class('nova::migration::qemu')
|
is_expected.to contain_class('nova::migration::qemu')
|
||||||
is_expected.to contain_file('/etc/libvirt/qemu/networks/autostart/default.xml').with_ensure('absent')
|
|
||||||
is_expected.to contain_file('/etc/libvirt/qemu/networks/default.xml').with_ensure('absent')
|
|
||||||
is_expected.to contain_exec('libvirt-default-net-destroy')
|
|
||||||
is_expected.to contain_class('nova::compute::libvirt::config').with_libvirtd_config(
|
is_expected.to contain_class('nova::compute::libvirt::config').with_libvirtd_config(
|
||||||
libvirt_daemon_config_default)
|
libvirt_daemon_config_default)
|
||||||
is_expected.to contain_package('cyrus-sasl-scram')
|
is_expected.to contain_package('cyrus-sasl-scram')
|
||||||
|
|
Loading…
Reference in New Issue