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

diff --git a/manifests/profile/base/nova/compute/libvirt.pp b/manifests/profile/base/nova/compute/libvirt.pp
index ec592cb..4097be3 100644 (file)
--- 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 {