diff options
| author |   Giulio Fidente <gfidente@redhat.com> | 2015-08-13 20:10:29 +0200 |
|---|---|---|
| committer | Giulio Fidente <gfidente@redhat.com> | 2015-11-05 19:39:09 +0100 |
| commit | 9ea7831eaeadced1b5599b6ef1feb01d0cb6dca2 (patch) | |
| tree | 0720707f75fdd9b7ec320a52958392585620415a /puppet/manifests/overcloud_compute.pp | |
| parent | e19ae9dfe03e2868562ef090c455aa9e8c394d9e (diff) | |
Allow customization of Ceph client user
Previously we enforced the Ceph user used by the OpenStack clients
to be named 'openstack', this change allows for customization
of such a name.
Change-Id: Idef3e1ed4e8e21b645081869b8d6fad2329bdc60
Diffstat (limited to 'puppet/manifests/overcloud_compute.pp')
| -rw-r--r-- | puppet/manifests/overcloud_compute.pp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp index 2150bab8..cd82554d 100644 --- a/puppet/manifests/overcloud_compute.pp +++ b/puppet/manifests/overcloud_compute.pp @@ -49,8 +49,9 @@ if $rbd_ephemeral_storage or $rbd_persistent_storage { include ::ceph::profile::client $client_keys = hiera('ceph::profile::params::client_keys') + $client_user = join(['client.', hiera('ceph_client_user_name')]) class { '::nova::compute::rbd': - libvirt_rbd_secret_key => $client_keys['client.openstack']['secret'], + libvirt_rbd_secret_key => $client_keys[$client_user]['secret'], } } |