openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix ceph keyring setting for gnocchi"

This commit is contained in:
Jenkins 2016-05-27 19:39:03 +00:00 committed by Gerrit Code Review
parent 5918136397 9e21e497d6
commit 083ec30c8c
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
puppet/ceph-cluster-config.yaml
View File

@ -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}

4
puppet/extraconfig/ceph/ceph-external-config.yaml
View File

@ -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}