summaryrefslogtreecommitdiffstats
path: root/playbooks/byo
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2017-09-12 11:07:12 -0400
committerMichael Gugino <mgugino@redhat.com>2017-09-20 13:04:03 -0400
commit4b8f66c37b865c7be59310854f5f9bd3de3e01bb (patch)
tree0de1cd2d6b8710503e7f2a1dc6c8fa1271b46ca6 /playbooks/byo
parentaf580f808d78667bde54b88d4c33fca493828945 (diff)
downloadopenshift-4b8f66c37b865c7be59310854f5f9bd3de3e01bb.tar.gz
openshift-4b8f66c37b865c7be59310854f5f9bd3de3e01bb.tar.bz2
openshift-4b8f66c37b865c7be59310854f5f9bd3de3e01bb.tar.xz
openshift-4b8f66c37b865c7be59310854f5f9bd3de3e01bb.zip
Cleanup old deployment types
Previously, openshift-ansible supported various types of deployments using the variable "openshift_deployment_type" Currently, openshift-ansible only supports two deployment types, "origin" and "openshift-enterprise". This commit removes all logic and references to deprecated deployment types.
Diffstat (limited to 'playbooks/byo')
-rw-r--r--playbooks/byo/rhel_subscribe.yml12
1 files changed, 6 insertions, 6 deletions
diff --git a/playbooks/byo/rhel_subscribe.yml b/playbooks/byo/rhel_subscribe.yml
index 1b14ff32e..06f914981 100644
--- a/playbooks/byo/rhel_subscribe.yml
+++ b/playbooks/byo/rhel_subscribe.yml
@@ -8,9 +8,9 @@
hosts: OSEv3
roles:
- role: rhel_subscribe
- when: deployment_type in ['atomic-enterprise', 'enterprise', 'openshift-enterprise'] and
- ansible_distribution == "RedHat" and
- lookup('oo_option', 'rhel_skip_subscription') | default(rhsub_skip, True) |
- default('no', True) | lower in ['no', 'false']
- - openshift_repos
- - os_update_latest
+ when:
+ - deployment_type == 'openshift-enterprise'
+ - ansible_distribution == "RedHat"
+ - lookup('oo_option', 'rhel_skip_subscription') | default(rhsub_skip, True) | default('no', True) | lower in ['no', 'false']
+ - role: openshift_repos
+ - role: os_update_latest