openstack/kolla-ansible
Code Issues Proposed changes

Fix copy external ceph files from custome/gnocchi in gnocchi

Browse Source 
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
This commit is contained in:
Jeffrey Zhang 2018-06-11 11:21:53 +08:00
parent 74d239bb88
commit dfb5ddaad6
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/gnocchi/tasks/external_ceph.yml
View File

@ -11,7 +11,7 @@
- name: Copy over ceph.conf file - name: Copy over ceph.conf file
template: template:
src: "{{ node_custom_config }}/{{ item }}/ceph.conf" src: "{{ node_custom_config }}/gnocchi/ceph.conf"
dest: "{{ node_config_directory }}/{{ item }}/ceph.conf" dest: "{{ node_config_directory }}/{{ item }}/ceph.conf"
when: inventory_hostname in groups[item] when: inventory_hostname in groups[item]
with_items: with_items:
@ -25,7 +25,7 @@
- name: Copy over ceph gnocchi keyring - name: Copy over ceph gnocchi keyring
copy: 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" dest: "{{ node_config_directory }}/{{ item }}/ceph.client.gnocchi.keyring"
when: inventory_hostname in groups[item] when: inventory_hostname in groups[item]
with_items: with_items:

5
releasenotes/notes/fix-gnocchi-external-ceph-filepath-672ea7ac3c325ec2.yaml Normal file
View File

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