diff --git a/manifests/profile/base/nova/libvirt.pp b/manifests/profile/base/nova/libvirt.pp index 44cbc360c..f58d08d5c 100644 --- a/manifests/profile/base/nova/libvirt.pp +++ b/manifests/profile/base/nova/libvirt.pp @@ -55,11 +55,15 @@ class tripleo::profile::base::nova::libvirt ( libvirtd_config => merge($libvirtd_config_default, $libvirtd_config) } - file { ['/etc/libvirt/qemu/networks/autostart/default.xml', - '/etc/libvirt/qemu/networks/default.xml']: - ensure => absent, - require => Package['libvirt'], - before => Service['libvirt'], + # This removal of files in /etc/libvirt/qemu should not happen inside containers + # Avoids LP#1819482 + if ! ($::uuid == 'docker' or $::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