openstack/kolla-ansible
Code Issues Proposed changes

Optimse the external ceph configure action

Browse Source 
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
This commit is contained in:
zhulingjie 2018-06-09 23:44:54 -04:00
parent be693c3518
commit 9cdd59ea98
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ansible/roles/manila/tasks/external_ceph.yml
View File

@ -7,10 +7,8 @@
- inventory_hostname in groups['manila-share'] - inventory_hostname in groups['manila-share']
- name: Copying over ceph.conf for manila - name: Copying over ceph.conf for manila
merge_configs: template:
sources: src: "{{ node_custom_config }}/manila/ceph.conf"
- "{{ node_custom_config }}/manila/ceph.conf"
- "{{ node_custom_config }}/manila/manila-share/ceph.conf"
dest: "{{ node_config_directory }}/manila-share/ceph.conf" dest: "{{ node_config_directory }}/manila-share/ceph.conf"
mode: "0660" mode: "0660"
become: true become: true
@ -26,8 +24,7 @@
mode: "0600" mode: "0600"
become: true become: true
with_fileglob: with_fileglob:
- "{{ node_custom_config }}/manila/ceph.client.manila.keyring" - "{{ node_custom_config }}/manila/ceph.client*"
- "{{ node_custom_config }}/manila/manila/ceph.client.manila.keyring"
when: when:
- inventory_hostname in groups['manila-share'] - inventory_hostname in groups['manila-share']
notify: notify: