From 9e21e497d6e169b1a6a2cb4a7fbb48d70cb6478a Mon Sep 17 00:00:00 2001 From: Pradeep Kilambi Date: Wed, 25 May 2016 13:07:17 -0400 Subject: 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.. This patch fixes the value to be full path. Closes-Bug: #1586010 Change-Id: I5666c44bb35b6ae109c68506704eff776f5dceda --- puppet/extraconfig/ceph/ceph-external-config.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'puppet/extraconfig') 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} -- cgit 1.2.3-korg