summaryrefslogtreecommitdiffstats
path: root/playbooks/gce/openshift-cluster/terminate.yml
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2015-07-17 16:22:09 -0400
committerThomas Wiest <twiest@users.noreply.github.com>2015-07-17 16:22:09 -0400
commit27c0895327dc5d1153aae6c63e7a70f13eb1f0d4 (patch)
treea7a850a3f490e89fbc4956013a3e95bde08552eb /playbooks/gce/openshift-cluster/terminate.yml
parentb37fcf39edf13c90e7df33b41b4ca8de0aca0838 (diff)
parentfb4083bb920d193c2f292b49f370667029c317ba (diff)
downloadopenshift-27c0895327dc5d1153aae6c63e7a70f13eb1f0d4.tar.gz
openshift-27c0895327dc5d1153aae6c63e7a70f13eb1f0d4.tar.bz2
openshift-27c0895327dc5d1153aae6c63e7a70f13eb1f0d4.tar.xz
openshift-27c0895327dc5d1153aae6c63e7a70f13eb1f0d4.zip
Merge pull request #264 from lhuard1A/rhel_subscription
Implement RHEL subscription for enterprise deployment type
Diffstat (limited to 'playbooks/gce/openshift-cluster/terminate.yml')
-rw-r--r--playbooks/gce/openshift-cluster/terminate.yml15
1 files changed, 13 insertions, 2 deletions
diff --git a/playbooks/gce/openshift-cluster/terminate.yml b/playbooks/gce/openshift-cluster/terminate.yml
index abe6a4c95..098b0df73 100644
--- a/playbooks/gce/openshift-cluster/terminate.yml
+++ b/playbooks/gce/openshift-cluster/terminate.yml
@@ -8,7 +8,7 @@
- set_fact: scratch_group=tag_env-host-type-{{ cluster_id }}-openshift-node
- add_host:
name: "{{ item }}"
- groups: oo_nodes_to_terminate
+ groups: oo_hosts_to_terminate, oo_nodes_to_terminate
ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user | default(ansible_ssh_user, true) }}"
ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}"
with_items: groups[scratch_group] | default([]) | difference(['localhost']) | difference(groups.status_terminated)
@@ -16,11 +16,22 @@
- set_fact: scratch_group=tag_env-host-type-{{ cluster_id }}-openshift-master
- add_host:
name: "{{ item }}"
- groups: oo_masters_to_terminate
+ groups: oo_hosts_to_terminate, oo_masters_to_terminate
ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user | default(ansible_ssh_user, true) }}"
ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}"
with_items: groups[scratch_group] | default([]) | difference(['localhost']) | difference(groups.status_terminated)
+- name: Unsubscribe VMs
+ hosts: oo_hosts_to_terminate
+ vars_files:
+ - vars.yml
+ roles:
+ - role: rhel_unsubscribe
+ when: deployment_type == "enterprise" and
+ ansible_distribution == "RedHat" and
+ lookup('oo_option', 'rhel_skip_subscription') | default(rhsub_skip, True) |
+ default('no', True) | lower in ['no', 'false']
+
- include: ../openshift-node/terminate.yml
vars:
gce_service_account_email: "{{ lookup('env', 'gce_service_account_email_address') }}"