summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-02-17 14:02:39 +0000
committerGerrit Code Review <review@openstack.org>2016-02-17 14:02:39 +0000
commit1082ea9115c596b52c047254c66372ac1cf74e43 (patch)
treed4fa6d41faae90ded6d020b42917fbb706393f01
parent509c3be9efd0791a2ef7dd13c011b137b1b441e3 (diff)
parent9d83200459482e5b31f660fa312b468acfb2da4c (diff)
Merge "Wire the Glance rbd user correctly into the external Ceph template"
-rw-r--r--puppet/extraconfig/ceph/ceph-external-config.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/puppet/extraconfig/ceph/ceph-external-config.yaml b/puppet/extraconfig/ceph/ceph-external-config.yaml
index 7cefc24b..ebd6c251 100644
--- a/puppet/extraconfig/ceph/ceph-external-config.yaml
+++ b/puppet/extraconfig/ceph/ceph-external-config.yaml
@@ -76,7 +76,7 @@ resources:
cinder_rbd_pool_name: {get_param: CinderRbdPoolName}
glance::backend::rbd::rbd_store_pool: {get_param: GlanceRbdPoolName}
nova::compute::rbd::libvirt_rbd_user: {get_param: CephClientUserName}
- glance::backend::rbd::rbd_store_pool: {get_param: CephClientUserName}
+ glance::backend::rbd::rbd_store_user: {get_param: CephClientUserName}
nova::compute::rbd::rbd_keyring:
list_join:
- '.'