diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-07-05 19:43:53 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-07-05 19:43:53 +0000 |
| commit | e74e32338e008f2085053c12bdb9e5b8024d3df8 (patch) | |
| tree | 638dfd0f1b7cb5d1c26f3c8eae9d2c1e3f32f843 /manifests | |
| parent | ad6c4e9c9118bd81a73c49e923670a2787842e9b (diff) | |
| parent | 17da52b03048bad1388508055c9622a74f0d4c65 (diff) | |
Merge "Update puppet-tripleo libvirt to support docker deployments"
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/profile/base/nova/compute/libvirt.pp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/manifests/profile/base/nova/compute/libvirt.pp b/manifests/profile/base/nova/compute/libvirt.pp index ec592cb..4097be3 100644 --- a/manifests/profile/base/nova/compute/libvirt.pp +++ b/manifests/profile/base/nova/compute/libvirt.pp @@ -33,11 +33,7 @@ class tripleo::profile::base::nova::compute::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 { - $client_keys = hiera('ceph::profile::params::client_keys') - $client_user = join(['client.', hiera('nova::compute::rbd::libvirt_rbd_user')]) - class { '::nova::compute::rbd': - libvirt_rbd_secret_key => $client_keys[$client_user]['secret'], - } + include ::nova::compute::rbd } if $rbd_ephemeral_storage { |