diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-11-11 15:29:28 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-11-11 15:29:28 +0000 |
| commit | 1b22aed7054ca08e93d870bdc6103c36f97c4b17 (patch) | |
| tree | 3928dda1c9ce09b385efeafb70ec1418c0d49749 /puppet/manifests/overcloud_compute.pp | |
| parent | 7961f61a413eb36caf46677655cbf8af8bfb6303 (diff) | |
| parent | 9ea7831eaeadced1b5599b6ef1feb01d0cb6dca2 (diff) | |
Merge "Allow customization of Ceph client user"
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 4c927569..cd41cc79 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'], } } |