Merge pull request #2608 from abutcher/template-with-items

Template with_items for upstream ansible-2.2 compat.

25 files changed, 44 insertions, 44 deletions

diff --git a/playbooks/adhoc/noc/get_zabbix_problems.yml b/playbooks/adhoc/noc/get_zabbix_problems.yml
index 79cae24ab..32fc7ce68 100644
--- a/playbooks/adhoc/noc/get_zabbix_problems.yml
+++ b/playbooks/adhoc/noc/get_zabbix_problems.yml
@@ -33,7 +33,7 @@
     - add_host:
         name: "{{ item }}"
         groups: problem_hosts_group
-      with_items: problem_hosts
+      with_items: "{{ problem_hosts }}"
 
 - name: "Run on problem hosts"
   hosts: problem_hosts_group
diff --git a/playbooks/aws/openshift-cluster/list.yml b/playbooks/aws/openshift-cluster/list.yml
index a542b4ca3..4934ae6d0 100644
--- a/playbooks/aws/openshift-cluster/list.yml
+++ b/playbooks/aws/openshift-cluster/list.yml
@@ -16,7 +16,7 @@
       groups: oo_list_hosts
       ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
       ansible_become: "{{ deployment_vars[deployment_type].become }}"
-    with_items: groups[scratch_group] | default([]) | difference(['localhost'])
+    with_items: "{{ groups[scratch_group] | default([]) | difference(['localhost']) }}"
 
 - name: List Hosts
   hosts: oo_list_hosts
diff --git a/playbooks/aws/openshift-cluster/tasks/launch_instances.yml b/playbooks/aws/openshift-cluster/tasks/launch_instances.yml
index d22c86cda..4d76d3bfe 100644
--- a/playbooks/aws/openshift-cluster/tasks/launch_instances.yml
+++ b/playbooks/aws/openshift-cluster/tasks/launch_instances.yml
@@ -99,8 +99,8 @@
 - name: Add Name tag to instances
   ec2_tag: resource={{ item.1.id }} region={{ deployment_vars[deployment_type].region }} state=present
   with_together:
-  - instances
-  - ec2.instances
+  - "{{ instances }}"
+  - "{{ ec2.instances }}"
   args:
     tags:
       Name: "{{ item.0 }}"
@@ -154,8 +154,8 @@
     openshift_node_labels: "{{ node_label }}"
     logrotate_scripts: "{{ logrotate }}"
   with_together:
-  - instances
-  - ec2.instances
+  - "{{ instances }}"
+  - "{{ ec2.instances }}"
 
 - name: Add new instances to nodes_to_add group if needed
   add_host:
@@ -169,13 +169,13 @@
     openshift_node_labels: "{{ node_label }}"
     logrotate_scripts: "{{ logrotate }}"
   with_together:
-  - instances
-  - ec2.instances
+  - "{{ instances }}"
+  - "{{ ec2.instances }}"
   when: oo_extend_env is defined and oo_extend_env | bool
 
 - name: Wait for ssh
   wait_for: "port=22 host={{ item.dns_name }}"
-  with_items: ec2.instances
+  with_items: "{{ ec2.instances }}"
 
 - name: Wait for user setup
   command: "ssh -o StrictHostKeyChecking=no -o PasswordAuthentication=no -o ConnectTimeout=10 -o UserKnownHostsFile=/dev/null {{ hostvars[item.0].ansible_ssh_user }}@{{ item.1.dns_name }} echo {{ hostvars[item.0].ansible_ssh_user }} user is setup"
@@ -184,5 +184,5 @@
   retries: 20
   delay: 10
   with_together:
-  - instances
-  - ec2.instances
+  - "{{ instances }}"
+  - "{{ ec2.instances }}"
diff --git a/playbooks/aws/openshift-cluster/terminate.yml b/playbooks/aws/openshift-cluster/terminate.yml
index fb13e1839..7a8375d0e 100644
--- a/playbooks/aws/openshift-cluster/terminate.yml
+++ b/playbooks/aws/openshift-cluster/terminate.yml
@@ -12,7 +12,7 @@
       groups: oo_hosts_to_terminate
       ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
       ansible_become: "{{ deployment_vars[deployment_type].become }}"
-    with_items: (groups['tag_clusterid_' ~ cluster_id] | default([])) | difference(['localhost'])
+    with_items: "{{ (groups['tag_clusterid_' ~ cluster_id] | default([])) | difference(['localhost']) }}"
 
 - name: Unsubscribe VMs
   hosts: oo_hosts_to_terminate
@@ -39,7 +39,7 @@
           clusterid:     "{{ hostvars[item]['ec2_tag_clusterid'] }}"
           host-type:     "{{ hostvars[item]['ec2_tag_host-type'] }}"
           sub_host_type: "{{ hostvars[item]['ec2_tag_sub-host-type'] }}"
-      with_items: groups.oo_hosts_to_terminate
+      with_items: "{{ groups.oo_hosts_to_terminate }}"
       when: "'oo_hosts_to_terminate' in groups"
 
     - name: Terminate instances
@@ -49,7 +49,7 @@
         region: "{{ hostvars[item].ec2_region }}"
       ignore_errors: yes
       register: ec2_term
-      with_items: groups.oo_hosts_to_terminate
+      with_items: "{{ groups.oo_hosts_to_terminate }}"
       when: "'oo_hosts_to_terminate' in groups"
 
     # Fail if any of the instances failed to terminate with an error other
@@ -57,7 +57,7 @@
     - fail:
         msg: "Terminating instance {{ item.ec2_id }} failed with message {{ item.msg }}"
       when: "'oo_hosts_to_terminate' in groups and item.has_key('failed') and item.failed"
-      with_items: ec2_term.results
+      with_items: "{{ ec2_term.results }}"
 
     - name: Stop instance if termination failed
       ec2:
@@ -66,12 +66,12 @@
         region: "{{ item.item.ec2_region }}"
       register: ec2_stop
       when: "'oo_hosts_to_terminate' in groups and item.has_key('failed') and item.failed"
-      with_items: ec2_term.results
+      with_items: "{{ ec2_term.results }}"
 
     - name: Rename stopped instances
       ec2_tag: resource={{ item.item.item.ec2_id }} region={{ item.item.item.ec2_region }} state=present
       args:
         tags:
           Name: "{{ item.item.item.ec2_tag_Name }}-terminate"
-      with_items: ec2_stop.results
+      with_items: "{{ ec2_stop.results }}"
       when: ec2_stop | changed
diff --git a/playbooks/aws/openshift-cluster/update.yml b/playbooks/aws/openshift-cluster/update.yml
index d762203b2..ed05d61ed 100644
--- a/playbooks/aws/openshift-cluster/update.yml
+++ b/playbooks/aws/openshift-cluster/update.yml
@@ -7,7 +7,7 @@
   - add_host:
       name: "{{ item }}"
       groups: l_oo_all_hosts
-    with_items: g_all_hosts
+    with_items: "{{ g_all_hosts }}"
 
 - hosts: l_oo_all_hosts
   gather_facts: no
@@ -27,7 +27,7 @@
       groups: oo_hosts_to_update
       ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
       ansible_become: "{{ deployment_vars[deployment_type].become }}"
-    with_items: g_all_hosts | default([])
+    with_items: "{{ g_all_hosts | default([]) }}"
 
 - include: ../../common/openshift-cluster/update_repos_and_packages.yml
 
diff --git a/playbooks/byo/openshift-cluster/upgrades/docker/upgrade.yml b/playbooks/byo/openshift-cluster/upgrades/docker/upgrade.yml
index 1755203a4..a3ab78ccf 100644
--- a/playbooks/byo/openshift-cluster/upgrades/docker/upgrade.yml
+++ b/playbooks/byo/openshift-cluster/upgrades/docker/upgrade.yml
@@ -10,7 +10,7 @@
   - add_host:
       name: "{{ item }}"
       groups: l_oo_all_hosts
-    with_items: g_all_hosts | default([])
+    with_items: "{{ g_all_hosts | default([]) }}"
     changed_when: false
 
 - hosts: l_oo_all_hosts
diff --git a/playbooks/byo/openshift-cluster/upgrades/v3_2/upgrade.yml b/playbooks/byo/openshift-cluster/upgrades/v3_2/upgrade.yml
index 5d549eee7..d92761e48 100644
--- a/playbooks/byo/openshift-cluster/upgrades/v3_2/upgrade.yml
+++ b/playbooks/byo/openshift-cluster/upgrades/v3_2/upgrade.yml
@@ -10,7 +10,7 @@
   - add_host:
       name: "{{ item }}"
       groups: l_oo_all_hosts
-    with_items: g_all_hosts | default([])
+    with_items: "{{ g_all_hosts | default([]) }}"
 
 - hosts: l_oo_all_hosts
   gather_facts: no
diff --git a/playbooks/byo/openshift-master/restart.yml b/playbooks/byo/openshift-master/restart.yml
index 0cf669ae3..0a163526a 100644
--- a/playbooks/byo/openshift-master/restart.yml
+++ b/playbooks/byo/openshift-master/restart.yml
@@ -8,7 +8,7 @@
   - add_host:
       name: "{{ item }}"
       groups: l_oo_all_hosts
-    with_items: g_all_hosts
+    with_items: "{{ g_all_hosts }}"
 
 - hosts: l_oo_all_hosts
   gather_facts: no
diff --git a/playbooks/byo/openshift-master/scaleup.yml b/playbooks/byo/openshift-master/scaleup.yml
index fced79262..279eeab21 100644
--- a/playbooks/byo/openshift-master/scaleup.yml
+++ b/playbooks/byo/openshift-master/scaleup.yml
@@ -8,7 +8,7 @@
   - add_host:
       name: "{{ item }}"
       groups: l_oo_all_hosts
-    with_items: g_all_hosts
+    with_items: "{{ g_all_hosts }}"
 
 - hosts: l_oo_all_hosts
   gather_facts: no
diff --git a/playbooks/byo/openshift-node/scaleup.yml b/playbooks/byo/openshift-node/scaleup.yml
index 5737bb0e0..902221931 100644
--- a/playbooks/byo/openshift-node/scaleup.yml
+++ b/playbooks/byo/openshift-node/scaleup.yml
@@ -8,7 +8,7 @@
   - add_host:
       name: "{{ item }}"
       groups: l_oo_all_hosts
-    with_items: g_all_hosts
+    with_items: "{{ g_all_hosts }}"
 
 - hosts: l_oo_all_hosts
   gather_facts: no
diff --git a/playbooks/byo/rhel_subscribe.yml b/playbooks/byo/rhel_subscribe.yml
index f093411ef..f36caeb36 100644
--- a/playbooks/byo/rhel_subscribe.yml
+++ b/playbooks/byo/rhel_subscribe.yml
@@ -8,7 +8,7 @@
   - add_host:
       name: "{{ item }}"
       groups: l_oo_all_hosts
-    with_items: g_all_hosts
+    with_items: "{{ g_all_hosts }}"
 
 - hosts: l_oo_all_hosts
   gather_facts: no
diff --git a/playbooks/common/openshift-cluster/upgrades/init.yml b/playbooks/common/openshift-cluster/upgrades/init.yml
index f3b3abe0d..fbdb7900a 100644
--- a/playbooks/common/openshift-cluster/upgrades/init.yml
+++ b/playbooks/common/openshift-cluster/upgrades/init.yml
@@ -10,7 +10,7 @@
   - add_host:
       name: "{{ item }}"
       groups: l_oo_all_hosts
-    with_items: g_all_hosts | default([])
+    with_items: "{{ g_all_hosts | default([]) }}"
 
 - hosts: l_oo_all_hosts
   gather_facts: no
diff --git a/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml
index e43954453..a3bc3abe3 100644
--- a/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml
+++ b/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml
@@ -41,7 +41,7 @@
       {{ oc_cmd }} patch dc/{{ item['labels']['deploymentconfig'] }} -n {{ item['namespace'] }} -p
       '{"spec":{"template":{"spec":{"containers":[{"name":"router","image":"{{ router_image }}","livenessProbe":{"tcpSocket":null,"httpGet":{"path": "/healthz", "port": 1936, "host": "localhost", "scheme": "HTTP"},"initialDelaySeconds":10,"timeoutSeconds":1}}]}}}}'
       --api-version=v1
-    with_items: haproxy_routers
+    with_items: "{{ haproxy_routers }}"
 
   - name: Check for default registry
     command: >
diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
index 2c641e21e..947f865d3 100644
--- a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
+++ b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
@@ -11,7 +11,7 @@
     add_host:
       name: "{{ item }}"
       groups: etcd_hosts_to_backup
-    with_items: groups.oo_etcd_to_config if groups.oo_etcd_to_config is defined and groups.oo_etcd_to_config | length > 0 else groups.oo_first_master
+    with_items: "{{ groups.oo_etcd_to_config if groups.oo_etcd_to_config is defined and groups.oo_etcd_to_config | length > 0 else groups.oo_first_master }}"
 
 - name: Backup etcd
   hosts: etcd_hosts_to_backup
diff --git a/playbooks/common/openshift-etcd/service.yml b/playbooks/common/openshift-etcd/service.yml
index fd2bc24ae..f460612ba 100644
--- a/playbooks/common/openshift-etcd/service.yml
+++ b/playbooks/common/openshift-etcd/service.yml
@@ -10,7 +10,7 @@
 
   - name: Evaluate g_service_etcd
     add_host: name={{ item }} groups=g_service_etcd
-    with_items: oo_host_group_exp | default([])
+    with_items: "{{ oo_host_group_exp | default([]) }}"
 
 - name: Change etcd state on etcd instance(s)
   hosts: g_service_etcd
diff --git a/playbooks/common/openshift-loadbalancer/service.yml b/playbooks/common/openshift-loadbalancer/service.yml
index e06a14c89..efc80edf9 100644
--- a/playbooks/common/openshift-loadbalancer/service.yml
+++ b/playbooks/common/openshift-loadbalancer/service.yml
@@ -10,7 +10,7 @@
 
   - name: Evaluate g_service_lb
     add_host: name={{ item }} groups=g_service_lb
-    with_items: oo_host_group_exp | default([])
+    with_items: "{{ oo_host_group_exp | default([]) }}"
 
 - name: Change state on lb instance(s)
   hosts: g_service_lb
diff --git a/playbooks/common/openshift-master/service.yml b/playbooks/common/openshift-master/service.yml
index f60c5a2b5..5e5198335 100644
--- a/playbooks/common/openshift-master/service.yml
+++ b/playbooks/common/openshift-master/service.yml
@@ -10,7 +10,7 @@
 
   - name: Evaluate g_service_masters
     add_host: name={{ item }} groups=g_service_masters
-    with_items: oo_host_group_exp | default([])
+    with_items: "{{ oo_host_group_exp | default([]) }}"
 
 - name: Change state on master instance(s)
   hosts: g_service_masters
diff --git a/playbooks/common/openshift-nfs/service.yml b/playbooks/common/openshift-nfs/service.yml
index 20c8ca248..8468014da 100644
--- a/playbooks/common/openshift-nfs/service.yml
+++ b/playbooks/common/openshift-nfs/service.yml
@@ -8,7 +8,7 @@
 
   - name: Evaluate g_service_nfs
     add_host: name={{ item }} groups=g_service_nfs
-    with_items: oo_host_group_exp | default([])
+    with_items: "{{ oo_host_group_exp | default([]) }}"
 
 - name: Change state on nfs instance(s)
   hosts: g_service_nfs
diff --git a/playbooks/common/openshift-node/service.yml b/playbooks/common/openshift-node/service.yml
index 0f07add2a..33095c9fb 100644
--- a/playbooks/common/openshift-node/service.yml
+++ b/playbooks/common/openshift-node/service.yml
@@ -10,7 +10,7 @@
 
   - name: Evaluate g_service_nodes
     add_host: name={{ item }} groups=g_service_nodes
-    with_items: oo_host_group_exp | default([])
+    with_items: "{{ oo_host_group_exp | default([]) }}"
 
 - name: Change state on node instance(s)
   hosts: g_service_nodes
diff --git a/playbooks/gce/openshift-cluster/list.yml b/playbooks/gce/openshift-cluster/list.yml
index c29cac272..34dcd2496 100644
--- a/playbooks/gce/openshift-cluster/list.yml
+++ b/playbooks/gce/openshift-cluster/list.yml
@@ -16,7 +16,7 @@
       groups: oo_list_hosts
       ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
       ansible_become: "{{ deployment_vars[deployment_type].become }}"
-    with_items: groups[scratch_group] | default([], true) | difference(['localhost']) | difference(groups.status_terminated | default([], true))
+    with_items: "{{ groups[scratch_group] | default([], true) | difference(['localhost']) | difference(groups.status_terminated | default([], true)) }}"
 
 - name: List Hosts
   hosts: oo_list_hosts
diff --git a/playbooks/gce/openshift-cluster/tasks/launch_instances.yml b/playbooks/gce/openshift-cluster/tasks/launch_instances.yml
index 60cf21a5b..7c8189224 100644
--- a/playbooks/gce/openshift-cluster/tasks/launch_instances.yml
+++ b/playbooks/gce/openshift-cluster/tasks/launch_instances.yml
@@ -49,11 +49,11 @@
     gce_public_ip: "{{ item.public_ip }}"
     gce_private_ip: "{{ item.private_ip }}"
     openshift_node_labels: "{{ node_label }}"
-  with_items: gce.instance_data | default([], true)
+  with_items: "{{ gce.instance_data | default([], true) }}"
 
 - name: Wait for ssh
   wait_for: port=22 host={{ item.public_ip }}
-  with_items: gce.instance_data | default([], true)
+  with_items: "{{ gce.instance_data | default([], true) }}"
 
 - name: Wait for user setup
   command: "ssh -o StrictHostKeyChecking=no -o PasswordAuthentication=no -o ConnectTimeout=10 -o UserKnownHostsFile=/dev/null {{ hostvars[item.name].ansible_ssh_user }}@{{ item.public_ip }} echo {{ hostvars[item.name].ansible_ssh_user }} user is setup"
@@ -61,4 +61,4 @@
   until: result.rc == 0
   retries: 30
   delay: 5
-  with_items: gce.instance_data | default([], true)
+  with_items: "{{ gce.instance_data | default([], true) }}"
diff --git a/playbooks/gce/openshift-cluster/terminate.yml b/playbooks/gce/openshift-cluster/terminate.yml
index 6a0ac088a..68e60f9d4 100644
--- a/playbooks/gce/openshift-cluster/terminate.yml
+++ b/playbooks/gce/openshift-cluster/terminate.yml
@@ -12,7 +12,7 @@
       groups: oo_hosts_to_terminate
       ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
       ansible_become: "{{ deployment_vars[deployment_type].become }}"
-    with_items: (groups['tag_clusterid-' ~ cluster_id] | default([])) | difference(['localhost'])
+    with_items: "{{ (groups['tag_clusterid-' ~ cluster_id] | default([])) | difference(['localhost']) }}"
 
 - name: Unsubscribe VMs
   hosts: oo_hosts_to_terminate
@@ -43,7 +43,7 @@
         pem_file: "{{ lookup('env', 'gce_service_account_pem_file_path') }}"
         project_id: "{{ lookup('env', 'gce_project_id') }}"
         zone: "{{ lookup('env', 'zone') }}"
-      with_items: groups['oo_hosts_to_terminate'] | default([], true)
+      with_items: "{{ groups['oo_hosts_to_terminate'] | default([], true) }}"
       when: item is defined
 
 #- include: ../openshift-node/terminate.yml
diff --git a/playbooks/gce/openshift-cluster/update.yml b/playbooks/gce/openshift-cluster/update.yml
index 332f27da7..6d2af3d26 100644
--- a/playbooks/gce/openshift-cluster/update.yml
+++ b/playbooks/gce/openshift-cluster/update.yml
@@ -7,7 +7,7 @@
   - add_host:
       name: "{{ item }}"
       groups: l_oo_all_hosts
-    with_items: g_all_hosts
+    with_items: "{{ g_all_hosts }}"
 
 - hosts: l_oo_all_hosts
   gather_facts: no
@@ -27,7 +27,7 @@
       groups: oo_hosts_to_update
       ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
       ansible_become: "{{ deployment_vars[deployment_type].become }}"
-    with_items: g_all_hosts | default([])
+    with_items: "{{ g_all_hosts | default([]) }}"
 
 - include: ../../common/openshift-cluster/update_repos_and_packages.yml
 
diff --git a/playbooks/libvirt/openshift-cluster/list.yml b/playbooks/libvirt/openshift-cluster/list.yml
index eb64544db..86d5d0aad 100644
--- a/playbooks/libvirt/openshift-cluster/list.yml
+++ b/playbooks/libvirt/openshift-cluster/list.yml
@@ -16,7 +16,7 @@
       groups: oo_list_hosts
       ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
       ansible_become: "{{ deployment_vars[deployment_type].become }}"
-    with_items: groups[scratch_group] | default([]) | difference(['localhost'])
+    with_items: "{{ groups[scratch_group] | default([]) | difference(['localhost']) }}"
 
 - name: List Hosts
   hosts: oo_list_hosts
diff --git a/playbooks/openstack/openshift-cluster/update.yml b/playbooks/openstack/openshift-cluster/update.yml
index 332f27da7..6d2af3d26 100644
--- a/playbooks/openstack/openshift-cluster/update.yml
+++ b/playbooks/openstack/openshift-cluster/update.yml
@@ -7,7 +7,7 @@
   - add_host:
       name: "{{ item }}"
       groups: l_oo_all_hosts
-    with_items: g_all_hosts
+    with_items: "{{ g_all_hosts }}"
 
 - hosts: l_oo_all_hosts
   gather_facts: no
@@ -27,7 +27,7 @@
       groups: oo_hosts_to_update
       ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
       ansible_become: "{{ deployment_vars[deployment_type].become }}"
-    with_items: g_all_hosts | default([])
+    with_items: "{{ g_all_hosts | default([]) }}"
 
 - include: ../../common/openshift-cluster/update_repos_and_packages.yml