From 8acbb32b95617d0d8c1d0a30a06a5ca55fc42d21 Mon Sep 17 00:00:00 2001
From: Scott Solkhon <scott.solkhon@gresearch.co.uk>
Date: Wed, 14 Aug 2019 16:52:42 +0000
Subject: [PATCH] Add missing when condition for swift config files

Change-Id: If5bba855a6e34c971fdb1ceb6f10dba62e54b811
---
 ansible/roles/swift/tasks/config.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ansible/roles/swift/tasks/config.yml b/ansible/roles/swift/tasks/config.yml
index 81626b6876..21ef7aa67b 100644
--- a/ansible/roles/swift/tasks/config.yml
+++ b/ansible/roles/swift/tasks/config.yml
@@ -99,6 +99,7 @@
     dest: "{{ node_config_directory }}/swift-{{ item }}/{{ item }}.conf"
     mode: "0660"
   become: true
+  when: inventory_hostname in groups['swift-account-server']
   with_items:
     - "account-auditor"
     - "account-reaper"
@@ -119,6 +120,7 @@
     dest: "{{ node_config_directory }}/swift-{{ item }}/{{ item }}.conf"
     mode: "0660"
   become: true
+  when: inventory_hostname in groups['swift-container-server']
   with_items:
     - "container-auditor"
     - "container-replication-server"
@@ -139,6 +141,7 @@
     dest: "{{ node_config_directory }}/swift-{{ item }}/{{ item }}.conf"
     mode: "0660"
   become: true
+  when: inventory_hostname in groups['swift-object-server']
   with_items:
     - "object-auditor"
     - "object-expirer"
@@ -159,6 +162,7 @@
     dest: "{{ node_config_directory }}/swift-{{ item }}/{{ item }}.conf"
     mode: "0660"
   become: true
+  when: inventory_hostname in groups['swift-proxy-server']
   with_items:
     - "proxy-server"
 
@@ -168,6 +172,9 @@
     dest: "{{ node_config_directory }}/swift-rsyncd/rsyncd.conf"
     mode: "0660"
   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
   copy: