summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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}