From dfb5ddaad670ae60f5da92a051bdc79cf74b76ac Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Date: Mon, 11 Jun 2018 11:21:53 +0800
Subject: [PATCH] Fix copy external ceph files from custome/gnocchi in gnocchi

There is no need to load custom ceph.conf and keyring from different
folder for gnocchi components. Just load the files from
node_custom_config/gnocchi folder.

Depends-On: I379ff17856509c9321b86c13a72eacc18f5c1202
Change-Id: Id553dff274a29d82fb1b743437e3656d6f817e52
---
 ansible/roles/gnocchi/tasks/external_ceph.yml                | 4 ++--
 .../fix-gnocchi-external-ceph-filepath-672ea7ac3c325ec2.yaml | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/fix-gnocchi-external-ceph-filepath-672ea7ac3c325ec2.yaml

diff --git a/ansible/roles/gnocchi/tasks/external_ceph.yml b/ansible/roles/gnocchi/tasks/external_ceph.yml
index 16c166cb58..32c797d3d9 100644
--- a/ansible/roles/gnocchi/tasks/external_ceph.yml
+++ b/ansible/roles/gnocchi/tasks/external_ceph.yml
@@ -11,7 +11,7 @@
 
 - name: Copy over ceph.conf file
   template:
-    src: "{{ node_custom_config }}/{{ item }}/ceph.conf"
+    src: "{{ node_custom_config }}/gnocchi/ceph.conf"
     dest: "{{ node_config_directory }}/{{ item }}/ceph.conf"
   when: inventory_hostname in groups[item]
   with_items:
@@ -25,7 +25,7 @@
 
 - name: Copy over ceph gnocchi keyring
   copy:
-    src: "{{ node_custom_config }}/{{ item }}/ceph.client.gnocchi.keyring"
+    src: "{{ node_custom_config }}/gnocchi/ceph.client.gnocchi.keyring"
     dest: "{{ node_config_directory }}/{{ item }}/ceph.client.gnocchi.keyring"
   when: inventory_hostname in groups[item]
   with_items:
diff --git a/releasenotes/notes/fix-gnocchi-external-ceph-filepath-672ea7ac3c325ec2.yaml b/releasenotes/notes/fix-gnocchi-external-ceph-filepath-672ea7ac3c325ec2.yaml
new file mode 100644
index 0000000000..bfe2d07848
--- /dev/null
+++ b/releasenotes/notes/fix-gnocchi-external-ceph-filepath-672ea7ac3c325ec2.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Load custom ceph.conf and keyring file from <<node_custom_config>>/gnocchi
+    folder rathen than each folder of gnocchi components.