From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 14 Apr 2016 13:11:24 +0000 (+0000)
Subject: Merge "Use a different ceph key for admin/client user"
X-Git-Tag: opnfv-6.0.0~2038
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=58e3e0b30fb1650c39f8d99810b0c705de4eef47;p=apex-tripleo-heat-templates.git

Merge "Use a different ceph key for admin/client user"
---

58e3e0b30fb1650c39f8d99810b0c705de4eef47
diff --cc puppet/ceph-cluster-config.yaml
index 6c6be473,d8d4f0af..fd161886
--- a/puppet/ceph-cluster-config.yaml
+++ b/puppet/ceph-cluster-config.yaml
@@@ -94,10 -91,10 +94,10 @@@ 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'
 +                        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'
                        }
                      }"
                      params: