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

diff --git a/puppet/ceph-cluster-config.yaml b/puppet/ceph-cluster-config.yaml
index fd16188..f5873dd 100644 (file)
--- 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 5942088..308c609 100644 (file)
--- 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}