Merge "Add missing when condition for swift config files"

This commit is contained in:
Zuul 2019-08-14 20:07:12 +00:00 committed by Gerrit Code Review
commit f27a19680b

View File

@ -99,6 +99,7 @@
dest: "{{ node_config_directory }}/swift-{{ item }}/{{ item }}.conf" dest: "{{ node_config_directory }}/swift-{{ item }}/{{ item }}.conf"
mode: "0660" mode: "0660"
become: true become: true
when: inventory_hostname in groups['swift-account-server']
with_items: with_items:
- "account-auditor" - "account-auditor"
- "account-reaper" - "account-reaper"
@ -119,6 +120,7 @@
dest: "{{ node_config_directory }}/swift-{{ item }}/{{ item }}.conf" dest: "{{ node_config_directory }}/swift-{{ item }}/{{ item }}.conf"
mode: "0660" mode: "0660"
become: true become: true
when: inventory_hostname in groups['swift-container-server']
with_items: with_items:
- "container-auditor" - "container-auditor"
- "container-replication-server" - "container-replication-server"
@ -139,6 +141,7 @@
dest: "{{ node_config_directory }}/swift-{{ item }}/{{ item }}.conf" dest: "{{ node_config_directory }}/swift-{{ item }}/{{ item }}.conf"
mode: "0660" mode: "0660"
become: true become: true
when: inventory_hostname in groups['swift-object-server']
with_items: with_items:
- "object-auditor" - "object-auditor"
- "object-expirer" - "object-expirer"
@ -159,6 +162,7 @@
dest: "{{ node_config_directory }}/swift-{{ item }}/{{ item }}.conf" dest: "{{ node_config_directory }}/swift-{{ item }}/{{ item }}.conf"
mode: "0660" mode: "0660"
become: true become: true
when: inventory_hostname in groups['swift-proxy-server']
with_items: with_items:
- "proxy-server" - "proxy-server"
@ -168,6 +172,9 @@
dest: "{{ node_config_directory }}/swift-rsyncd/rsyncd.conf" dest: "{{ node_config_directory }}/swift-rsyncd/rsyncd.conf"
mode: "0660" mode: "0660"
become: true become: true
when: inventory_hostname in groups['swift-account-server'] or
inventory_hostname in groups['swift-container-server'] or
inventory_hostname in groups['swift-object-server']
- name: Copying over Swift ring files - name: Copying over Swift ring files
copy: copy: