diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-07-22 08:09:51 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-07-22 08:09:51 +0000 |
| commit | 207e9feab3fa803122c47b8d162909f737655766 (patch) | |
| tree | c2e88bac36ccd2c622470e1a3e1e6ffafcad6cc2 /manifests/profile/base/nova/compute/libvirt.pp | |
| parent | 1da0b51ecc703d01bb362c6b6038ab2bc652ea7a (diff) | |
| parent | e14120563938d40b1860e1d4945e578503ab428e (diff) | |
Merge "Make calls to nova::compute::rbd from libvirt profile"
Diffstat (limited to 'manifests/profile/base/nova/compute/libvirt.pp')
| -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 } |