diff options
| author | Thomas Wiest <twiest@users.noreply.github.com> | 2015-04-21 16:57:27 -0400 |
|---|---|---|
| committer | Thomas Wiest <twiest@users.noreply.github.com> | 2015-04-21 16:57:27 -0400 |
| commit | 8ca180543f51cee54a688fb4d83956916b6d6c8b (patch) | |
| tree | 555eb0dfb0c3d2a00576200e7c4815a64bdbd53e /playbooks/aws/openshift-cluster | |
| parent | 89c74233535537d7daae41730e22b7133870e40d (diff) | |
| parent | ba5ae4dbc7741af1963df36fd92bcd0af03c6b4f (diff) | |
| download | openshift-8ca180543f51cee54a688fb4d83956916b6d6c8b.tar.gz openshift-8ca180543f51cee54a688fb4d83956916b6d6c8b.tar.bz2 openshift-8ca180543f51cee54a688fb4d83956916b6d6c8b.tar.xz openshift-8ca180543f51cee54a688fb4d83956916b6d6c8b.zip | |
Merge pull request #166 from detiber/awsTerminate
aws terminate playbook improvements
Diffstat (limited to 'playbooks/aws/openshift-cluster')
| -rw-r--r-- | playbooks/aws/openshift-cluster/terminate.yml | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/playbooks/aws/openshift-cluster/terminate.yml b/playbooks/aws/openshift-cluster/terminate.yml index 1d2b60594..617d0d456 100644 --- a/playbooks/aws/openshift-cluster/terminate.yml +++ b/playbooks/aws/openshift-cluster/terminate.yml @@ -5,22 +5,12 @@ vars_files: - vars.yml tasks: - - set_fact: scratch_group=tag_env-host-type_{{ cluster_id }}-openshift-node + - set_fact: scratch_group=tag_env_{{ cluster_id }} - add_host: name: "{{ item }}" - groups: oo_nodes_to_terminate + groups: oo_hosts_to_terminate ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}" ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}" with_items: groups[scratch_group] | default([]) | difference(['localhost']) - - set_fact: scratch_group=tag_env-host-type_{{ cluster_id }}-openshift-master - - add_host: - name: "{{ item }}" - groups: oo_masters_to_terminate - ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}" - ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}" - with_items: groups[scratch_group] | default([]) | difference(['localhost']) - -- include: ../openshift-node/terminate.yml - -- include: ../openshift-master/terminate.yml +- include: ../terminate.yml |