summaryrefslogtreecommitdiffstats
path: root/manifests/profile/base
diff options
context:
space:
mode:
authorKeith Schincke <keith.schincke@gmail.com>2017-05-23 14:44:23 -0400
committerGiulio Fidente <gfidente@redhat.com>2017-07-03 15:51:34 +0000
commit17da52b03048bad1388508055c9622a74f0d4c65 (patch)
treed39feb3ca78469a106a582eb8ecaa05833f2a25e /manifests/profile/base
parentd5582dd84bb0df561132e258f3dbdd16b42eb676 (diff)
Update puppet-tripleo libvirt to support docker deployments
It is not necessary to mangle libvirt_rbd_secret_key parameter as this is now given by the templates. Depends-On: Iff3dbcb0f1b4d2373570e184e636a71553cea708 Change-Id: I6b163ab102f505f0d0ce9eb1ad9d4274e4ff6348
Diffstat (limited to 'manifests/profile/base')
-rw-r--r--manifests/profile/base/nova/compute/libvirt.pp6
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 {