diff options
| author |   Pradeep Kilambi <pkilambi@redhat.com> | 2016-05-25 13:07:17 -0400 |
|---|---|---|
| committer | Pradeep Kilambi <pkilambi@redhat.com> | 2016-05-26 11:58:59 +0000 |
| commit | 9e21e497d6e169b1a6a2cb4a7fbb48d70cb6478a (patch) | |
| tree | 853a911083392e50a4dcf5750a3662068734fa05 | |
| parent | c7d996765ba86d245fb2a4f0ade01142689aafb0 (diff) | |
Fix ceph keyring setting for gnocchi
The ceph_keyring value is expected to be a full path
to the keyring. But we currently only pass in
client.<cephuser>. This patch fixes the value
to be full path.
Closes-Bug: #1586010
Change-Id: I5666c44bb35b6ae109c68506704eff776f5dceda
| -rw-r--r-- | puppet/ceph-cluster-config.yaml | 4 | ||||
| -rw-r--r-- | puppet/extraconfig/ceph/ceph-external-config.yaml | 4 |
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} |