From: Giulio Fidente <gfidente@redhat.com>
Date: Fri, 1 Jul 2016 17:38:54 +0000 (+0200)
Subject: Replace reference to cinder:: parameter with nova:: parameter
X-Git-Tag: opnfv-6.0.0~705^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=05a2b8820111ba05c3b5e1fe0d6df0c7162a1fc8;p=apex-puppet-tripleo.git

Replace reference to cinder:: parameter with nova:: parameter

Changes a reference to a cinder:: parameter into the nova compute
class to a nova:: parameter, which makes sure we're not trying
to access "out of bound" parameters.

Change-Id: I871ef420700e6d0ee5c1e444e019d58b3a9a45a6
---

diff --git a/manifests/profile/base/nova/compute/libvirt.pp b/manifests/profile/base/nova/compute/libvirt.pp
index 74af7fc..5b6f895 100644
--- a/manifests/profile/base/nova/compute/libvirt.pp
+++ b/manifests/profile/base/nova/compute/libvirt.pp
@@ -35,7 +35,7 @@ class tripleo::profile::base::nova::compute::libvirt (
     $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('tripleo::profile::base::cinder::volume::rbd::cinder_rbd_user_name')])
+      $client_user = join(['client.', hiera('nova::compute::rbd::libvirt_rbd_user')])
       class { '::nova::compute::rbd':
         libvirt_rbd_secret_key => $client_keys[$client_user]['secret'],
       }