summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-04-14 13:11:24 +0000
committerGerrit Code Review <review@openstack.org>2016-04-14 13:11:25 +0000
commit58e3e0b30fb1650c39f8d99810b0c705de4eef47 (patch)
tree3fb21ba61d9c17e96ce9f1cb054e8c6066e29239
parent2b15978ba0ef9843345db18aabb2f999d4535381 (diff)
parentd3b841ce1dcfe27eab03cc50444783e38891812c (diff)
Merge "Use a different ceph key for admin/client user"
-rw-r--r--puppet/ceph-cluster-config.yaml3
1 files changed, 2 insertions, 1 deletions
diff --git a/puppet/ceph-cluster-config.yaml b/puppet/ceph-cluster-config.yaml
index 6c6be473..fd161886 100644
--- a/puppet/ceph-cluster-config.yaml
+++ b/puppet/ceph-cluster-config.yaml
@@ -94,7 +94,7 @@ resources:
cap_mon: 'allow profile bootstrap-osd'
},
client.CLIENT_USER: {
- secret: 'ADMIN_KEY',
+ secret: 'CLIENT_KEY',
mode: '0644',
cap_mon: 'allow r',
cap_osd: 'allow class-read object_prefix rbd_children, allow rwx pool=CINDER_POOL, allow rwx pool=NOVA_POOL, allow rwx pool=GLANCE_POOL, allow rwx pool=GNOCCHI_POOL'
@@ -102,6 +102,7 @@ resources:
}"
params:
CLIENT_USER: {get_param: CephClientUserName}
+ CLIENT_KEY: {get_param: ceph_client_key}
ADMIN_KEY: {get_param: ceph_admin_key}
NOVA_POOL: {get_param: NovaRbdPoolName}
CINDER_POOL: {get_param: CinderRbdPoolName}