summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2016-02-16 12:41:20 +0100
committerGiulio Fidente <gfidente@redhat.com>2016-02-16 12:41:20 +0100
commit9d83200459482e5b31f660fa312b468acfb2da4c (patch)
tree57cd3b7d01623bb7c8b41d73dbc48cc87371e9bf
parentb90fae796489e33a55f4bd80e35afda3ab52b3a3 (diff)
Wire the Glance rbd user correctly into the external Ceph template
We were incorrectly wiring the rbd user to the relevant glance module parameter, making it was impossible to customize the rbd user when using an external Ceph. Change-Id: Ibe4eaedf986a9077f869c6530381e69ee0281f5b
-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:
- '.'