From 9cdd59ea98ac0d7ba788db894b9a6c4045fd0caa Mon Sep 17 00:00:00 2001
From: zhulingjie <easyzlj@gmail.com>
Date: Sat, 9 Jun 2018 23:44:54 -0400
Subject: [PATCH] Optimse the external ceph configure action
1. refer to the docs of external ceph for manila[0],
the ceph.conf will be found in ``/etc/kolla/config/manila/``,
so remove the unnecessary ``manila/manila-share`` folder
2. remove the ``manila/manila/ceph.client.manila.keyring``
[0]: https://github.com/openstack/kolla-ansible/blob/master/doc/source/reference/external-ceph-guide.rst
Change-Id: I93308b859b769a856c0519347277f01947f86f3d
---
ansible/roles/manila/tasks/external_ceph.yml | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/ansible/roles/manila/tasks/external_ceph.yml b/ansible/roles/manila/tasks/external_ceph.yml
index 1ab0aec387..1793380a22 100644
--- a/ansible/roles/manila/tasks/external_ceph.yml
+++ b/ansible/roles/manila/tasks/external_ceph.yml
@@ -7,10 +7,8 @@
- inventory_hostname in groups['manila-share']
- name: Copying over ceph.conf for manila
- merge_configs:
- sources:
- - "{{ node_custom_config }}/manila/ceph.conf"
- - "{{ node_custom_config }}/manila/manila-share/ceph.conf"
+ template:
+ src: "{{ node_custom_config }}/manila/ceph.conf"
dest: "{{ node_config_directory }}/manila-share/ceph.conf"
mode: "0660"
become: true
@@ -26,8 +24,7 @@
mode: "0600"
become: true
with_fileglob:
- - "{{ node_custom_config }}/manila/ceph.client.manila.keyring"
- - "{{ node_custom_config }}/manila/manila/ceph.client.manila.keyring"
+ - "{{ node_custom_config }}/manila/ceph.client*"
when:
- inventory_hostname in groups['manila-share']
notify: