Skip to content
Snippets Groups Projects
Commit 0844bf33 authored by Zuul's avatar Zuul Committed by Gerrit Code Review
Browse files

Merge "Optimse the external ceph configure action"

parents 2a8de868 9cdd59ea
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
ansible/roles/manila/tasks/external_ceph.yml
+ 3
− 6
View file @ 0844bf33
...@@ -7,10 +7,8 @@ ...@@ -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 @@ ...@@ -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:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment