summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-05-27 19:39:03 +0000
committerGerrit Code Review <review@openstack.org>2016-05-27 19:39:03 +0000
commit083ec30c8c0838f60d2398d464fa8409ddb329ed (patch)
tree80fa13d2d3cc466e4e1899c1d9e825f0c5d32d82 /puppet
parent5918136397b0f4bb97a884e76dba2e0edea19ddd (diff)
parent9e21e497d6e169b1a6a2cb4a7fbb48d70cb6478a (diff)
Merge "Fix ceph keyring setting for gnocchi"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/ceph-cluster-config.yaml4
-rw-r--r--puppet/extraconfig/ceph/ceph-external-config.yaml4
2 files changed, 6 insertions, 2 deletions
diff --git a/puppet/ceph-cluster-config.yaml b/puppet/ceph-cluster-config.yaml
index fd161886..f5873ddb 100644
--- a/puppet/ceph-cluster-config.yaml
+++ b/puppet/ceph-cluster-config.yaml
@@ -123,8 +123,10 @@ resources:
gnocchi::storage::ceph::ceph_keyring:
list_join:
- '.'
- - - 'client'
+ - - '/etc/ceph/ceph'
+ - 'client'
- {get_param: CephClientUserName}
+ - 'keyring'
ceph_client_user_name: {get_param: CephClientUserName}
ceph_pools:
- {get_param: CinderRbdPoolName}
diff --git a/puppet/extraconfig/ceph/ceph-external-config.yaml b/puppet/extraconfig/ceph/ceph-external-config.yaml
index 5942088c..308c609a 100644
--- a/puppet/extraconfig/ceph/ceph-external-config.yaml
+++ b/puppet/extraconfig/ceph/ceph-external-config.yaml
@@ -97,8 +97,10 @@ resources:
gnocchi::storage::ceph::ceph_keyring:
list_join:
- '.'
- - - 'client'
+ - - '/etc/ceph/ceph'
+ - 'client'
- {get_param: CephClientUserName}
+ - 'keyring'
ceph_client_user_name: {get_param: CephClientUserName}
ceph_pools:
- {get_param: CinderRbdPoolName}