diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-06-22 10:31:35 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-06-22 10:31:36 +0000 |
| commit | ece014ecbe247ca75e788334d8dcb6fe1edaa0f0 (patch) | |
| tree | 67e20942907b5abf9d642ce9d24308b04fdd5a15 /manifests/profile/base/nova/compute | |
| parent | 3b0555b42da1ca0c6df336cb0dbe708608b83f9d (diff) | |
| parent | 7c39de974cecb43849565e4b66722647531a468a (diff) | |
Merge "Create libvirt micro-service"
Diffstat (limited to 'manifests/profile/base/nova/compute')
| -rw-r--r-- | manifests/profile/base/nova/compute/libvirt.pp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/manifests/profile/base/nova/compute/libvirt.pp b/manifests/profile/base/nova/compute/libvirt.pp index f6d6a0a..74af7fc 100644 --- a/manifests/profile/base/nova/compute/libvirt.pp +++ b/manifests/profile/base/nova/compute/libvirt.pp @@ -30,20 +30,6 @@ class tripleo::profile::base::nova::compute::libvirt ( if $step >= 4 { include ::tripleo::profile::base::nova::compute - file { ['/etc/libvirt/qemu/networks/autostart/default.xml', - '/etc/libvirt/qemu/networks/default.xml']: - ensure => absent, - 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"', - before => Service['libvirt'], - } - # Ceph + Libvirt $rbd_ephemeral_storage = hiera('nova::compute::rbd::ephemeral_storage', false) $rbd_persistent_storage = hiera('rbd_persistent_storage', false) |