diff options
| author |   Giulio Fidente <gfidente@redhat.com> | 2017-07-19 15:19:30 +0200 |
|---|---|---|
| committer | Giulio Fidente <gfidente@redhat.com> | 2017-07-19 16:38:40 +0200 |
| commit | e14120563938d40b1860e1d4945e578503ab428e (patch) | |
| tree | 488aa6b348ec32591a0d8d5ab1533112e6b357b0 /manifests/profile/base/nova/compute | |
| parent | cb66aeb0677595c4c4f83a704fad45ec6f991cc1 (diff) | |
Make calls to nova::compute::rbd from libvirt profile
Some of the tasks carried by nova::compute::rbd class apply libvirt.
Change-Id: Ib233689fdcdda391596d01a21f77bd8e1672ae04
Depends-On: I28557deb13b75922932cd3e86c3467a541c988d0
Diffstat (limited to 'manifests/profile/base/nova/compute')
| -rw-r--r-- | manifests/profile/base/nova/compute/libvirt.pp | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/manifests/profile/base/nova/compute/libvirt.pp b/manifests/profile/base/nova/compute/libvirt.pp index 8a7c4d6..ccecaf2 100644 --- a/manifests/profile/base/nova/compute/libvirt.pp +++ b/manifests/profile/base/nova/compute/libvirt.pp @@ -29,25 +29,7 @@ class tripleo::profile::base::nova::compute::libvirt ( if $step >= 4 { include ::tripleo::profile::base::nova::compute include ::tripleo::profile::base::nova::migration::client - - # Ceph + Libvirt - $rbd_ephemeral_storage = hiera('nova::compute::rbd::ephemeral_storage', false) - $rbd_persistent_storage = hiera('rbd_persistent_storage', false) - if $rbd_ephemeral_storage or $rbd_persistent_storage { - include ::nova::compute::rbd - } - - if $rbd_ephemeral_storage { - class { '::nova::compute::libvirt': - libvirt_disk_cachemodes => ['network=writeback'], - libvirt_hw_disk_discard => 'unmap', - } - } else { - include ::nova::compute::libvirt - } - - include ::nova::compute::libvirt::qemu - } + include ::tripleo::profile::base::nova::compute_libvirt_shared } |