From d610c38646bf41ffa6e03b5e0d920cd18ae1c490 Mon Sep 17 00:00:00 2001
From: Travis Truman <travis_truman@cable.comcast.com>
Date: Wed, 2 Mar 2016 15:54:38 -0500
Subject: [PATCH] Removing unneeded with_items usage for clarity

Change-Id: I50a97ab64ab1db8be6fad7479301b1cc0abe9ba9
---
 tasks/swift_pre_install.yml             | 10 ++++------
 tasks/swift_proxy_hosts.yml             | 13 ++++---------
 tasks/swift_storage_hosts_account.yml   | 26 ++++++++-----------------
 tasks/swift_storage_hosts_container.yml | 13 ++++---------
 tasks/swift_storage_hosts_object.yml    | 13 ++++---------
 5 files changed, 24 insertions(+), 51 deletions(-)

diff --git a/tasks/swift_pre_install.yml b/tasks/swift_pre_install.yml
index e931e007..9c348e07 100644
--- a/tasks/swift_pre_install.yml
+++ b/tasks/swift_pre_install.yml
@@ -101,13 +101,11 @@
 
 - name: Create swift log dir
   file:
-    path: "{{ item.path }}"
+    path: "/var/log/swift"
     state: directory
-    owner: "{{ item.owner|default(swift_system_user_name) }}"
-    group: "{{ item.group|default(swift_system_group_name) }}"
-    mode: "{{ item.mode|default('0755') }}"
-  with_items:
-    - { path: "/var/log/swift", owner: "syslog", group: "syslog" }
+    owner: "syslog"
+    group: "syslog"
+    mode: "0755"
   when: log_dir.rc != 0
   tags:
     - swift-dirs
diff --git a/tasks/swift_proxy_hosts.yml b/tasks/swift_proxy_hosts.yml
index 08477b98..f7b39c5a 100644
--- a/tasks/swift_proxy_hosts.yml
+++ b/tasks/swift_proxy_hosts.yml
@@ -24,16 +24,11 @@
 
 - name: swift proxy server configuration
   config_template:
-    src: "{{ item.src }}"
-    dest: "{{ item.dest }}"
+    src: "proxy-server.conf.j2"
+    dest: "/etc/swift/proxy-server/proxy-server.conf"
     owner: "{{ swift_system_user_name }}"
     group: "{{ swift_system_group_name }}"
     mode: "0644"
-    config_overrides: "{{ item.config_overrides }}"
-    config_type: "{{ item.config_type }}"
-  with_items:
-    - src: "proxy-server.conf.j2"
-      dest: "/etc/swift/proxy-server/proxy-server.conf"
-      config_overrides: "{{ swift_proxy_server_conf_overrides }}"
-      config_type: "ini"
+    config_overrides: "{{ swift_proxy_server_conf_overrides }}"
+    config_type: "ini"
   notify: Restart swift proxy services
diff --git a/tasks/swift_storage_hosts_account.yml b/tasks/swift_storage_hosts_account.yml
index 49ad8927..29527f30 100644
--- a/tasks/swift_storage_hosts_account.yml
+++ b/tasks/swift_storage_hosts_account.yml
@@ -81,35 +81,25 @@
 
 - name: "Swift account server configuration"
   config_template:
-    src: "{{ item.src }}"
-    dest: "{{ item.dest }}"
+    src: "account-server.conf.j2"
+    dest: "/etc/swift/account-server/account-server.conf"
     owner: "{{ swift_system_user_name }}"
     group: "{{ swift_system_group_name }}"
     mode: "0644"
-    config_overrides: "{{ item.config_overrides }}"
-    config_type: "{{ item.config_type }}"
-  with_items:
-    - src: "account-server.conf.j2"
-      dest: "/etc/swift/account-server/account-server.conf"
-      config_overrides: "{{ swift_account_server_conf_overrides }}"
-      config_type: "ini"
+    config_overrides: "{{ swift_account_server_conf_overrides }}"
+    config_type: "ini"
   notify: Restart swift account services
 
 # We only create the dedicated replicator configuration when using a dedicated replication_network
 - name: "Swift account server replicator configuration"
   config_template:
-    src: "{{ item.src }}"
-    dest: "{{ item.dest }}"
+    src: "account-server-replicator.conf.j2"
+    dest: "/etc/swift/account-server/account-server-replicator.conf"
     owner: "{{ swift_system_user_name }}"
     group: "{{ swift_system_group_name }}"
     mode: "0644"
-    config_overrides: "{{ item.config_overrides }}"
-    config_type: "{{ item.config_type }}"
-  with_items:
-    - src: "account-server-replicator.conf.j2"
-      dest: "/etc/swift/account-server/account-server-replicator.conf"
-      config_overrides: "{{ swift_account_server_replicator_conf_overrides }}"
-      config_type: "ini"
+    config_overrides: "{{ swift_account_server_replicator_conf_overrides }}"
+    config_type: "ini"
   when: >
     swift.replication_network is defined and
     swift.replication_network != swift.storage_network
diff --git a/tasks/swift_storage_hosts_container.yml b/tasks/swift_storage_hosts_container.yml
index 0d31bc46..9aee965a 100644
--- a/tasks/swift_storage_hosts_container.yml
+++ b/tasks/swift_storage_hosts_container.yml
@@ -120,18 +120,13 @@
 # We only create the dedicated replicator configuration when using a dedicated replication_network
 - name: "Swift container server replicator configuration"
   config_template:
-    src: "{{ item.src }}"
-    dest: "{{ item.dest }}"
+    src: "container-server-replicator.conf.j2"
+    dest: "/etc/swift/container-server/container-server-replicator.conf"
     owner: "{{ swift_system_user_name }}"
     group: "{{ swift_system_group_name }}"
     mode: "0644"
-    config_overrides: "{{ item.config_overrides }}"
-    config_type: "{{ item.config_type }}"
-  with_items:
-    - src: "container-server-replicator.conf.j2"
-      dest: "/etc/swift/container-server/container-server-replicator.conf"
-      config_overrides: "{{ swift_container_server_replicator_conf_overrides }}"
-      config_type: "ini"
+    config_overrides: "{{ swift_container_server_replicator_conf_overrides }}"
+    config_type: "ini"
   when: >
     swift.replication_network is defined and
     swift.replication_network != swift.storage_network
diff --git a/tasks/swift_storage_hosts_object.yml b/tasks/swift_storage_hosts_object.yml
index 974a0e47..a1325616 100644
--- a/tasks/swift_storage_hosts_object.yml
+++ b/tasks/swift_storage_hosts_object.yml
@@ -111,18 +111,13 @@
 # We only create the dedicated replicator configuration when using a dedicated replication_network
 - name: "Swift object server replicator configuration"
   config_template:
-    src: "{{ item.src }}"
-    dest: "{{ item.dest }}"
+    src: "object-server-replicator.conf.j2"
+    dest: "/etc/swift/object-server/object-server-replicator.conf"
     owner: "{{ swift_system_user_name }}"
     group: "{{ swift_system_group_name }}"
     mode: "0644"
-    config_overrides: "{{ item.config_overrides }}"
-    config_type: "{{ item.config_type }}"
-  with_items:
-    - src: "object-server-replicator.conf.j2"
-      dest: "/etc/swift/object-server/object-server-replicator.conf"
-      config_overrides: "{{ swift_object_server_replicator_conf_overrides }}"
-      config_type: "ini"
+    config_overrides: "{{ swift_object_server_replicator_conf_overrides }}"
+    config_type: "ini"
   when: >
     swift.replication_network is defined and
     swift.replication_network != swift.storage_network