summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2016-01-07 11:51:18 -0500
committerThomas Wiest <twiest@users.noreply.github.com>2016-01-07 11:51:18 -0500
commitdd93ec9ae0ec8d9e9cf9c1cf5c7f0efa3746749c (patch)
treee6395f0ec7d6773cc42adf6fa8ab0c123f279ca0
parentb239a510e182482e947ff49d8ab00180bf410c0e (diff)
parent01f85460ce96905eb8fc6e66b9d800e46df54772 (diff)
downloadopenshift-dd93ec9ae0ec8d9e9cf9c1cf5c7f0efa3746749c.tar.gz
openshift-dd93ec9ae0ec8d9e9cf9c1cf5c7f0efa3746749c.tar.bz2
openshift-dd93ec9ae0ec8d9e9cf9c1cf5c7f0efa3746749c.tar.xz
openshift-dd93ec9ae0ec8d9e9cf9c1cf5c7f0efa3746749c.zip
Merge pull request #1131 from lhuard1A/fix_terminate_openstack
Fix terminate.yml on OpenStack
-rw-r--r--playbooks/openstack/openshift-cluster/terminate.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/playbooks/openstack/openshift-cluster/terminate.yml b/playbooks/openstack/openshift-cluster/terminate.yml
index d0abe9fa5..d4ab51fa7 100644
--- a/playbooks/openstack/openshift-cluster/terminate.yml
+++ b/playbooks/openstack/openshift-cluster/terminate.yml
@@ -11,7 +11,7 @@
groups: oo_hosts_to_terminate
ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}"
- with_items: (groups['tag_environment_' ~ cluster_env]|default([])) | groups['tag_clusterid_' ~ cluster_id ] | default([])
+ with_items: (groups['tag_environment_' ~ cluster_env]|default([])) | intersect(groups['tag_clusterid_' ~ cluster_id ]|default([]))
- name: Unsubscribe VMs
hosts: oo_hosts_to_terminate