summaryrefslogtreecommitdiffstats
path: root/playbooks/gce/openshift-cluster/terminate.yml
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-10-17 10:43:16 -0400
committerGitHub <noreply@github.com>2016-10-17 10:43:16 -0400
commit844137e9e968fb0455b9cf5128342c3e449c8abb (patch)
tree070f227571aaeaf9d3b93d5dd13ed7842f697762 /playbooks/gce/openshift-cluster/terminate.yml
parent94af651106711912a7bce866517af088f4d1d0bf (diff)
parent12b17e1af352748d00d8ba2cf3b99a623ec61641 (diff)
downloadopenshift-844137e9e968fb0455b9cf5128342c3e449c8abb.tar.gz
openshift-844137e9e968fb0455b9cf5128342c3e449c8abb.tar.bz2
openshift-844137e9e968fb0455b9cf5128342c3e449c8abb.tar.xz
openshift-844137e9e968fb0455b9cf5128342c3e449c8abb.zip
Merge pull request #2608 from abutcher/template-with-items
Template with_items for upstream ansible-2.2 compat.
Diffstat (limited to 'playbooks/gce/openshift-cluster/terminate.yml')
-rw-r--r--playbooks/gce/openshift-cluster/terminate.yml4
1 files changed, 2 insertions, 2 deletions
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