diff options
| author | Michael Gugino <mgugino@redhat.com> | 2017-09-12 11:07:12 -0400 |
|---|---|---|
| committer | Michael Gugino <mgugino@redhat.com> | 2017-09-20 13:04:03 -0400 |
| commit | 4b8f66c37b865c7be59310854f5f9bd3de3e01bb (patch) | |
| tree | 0de1cd2d6b8710503e7f2a1dc6c8fa1271b46ca6 /roles/rhel_subscribe | |
| parent | af580f808d78667bde54b88d4c33fca493828945 (diff) | |
| download | openshift-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 'roles/rhel_subscribe')
| -rw-r--r-- | roles/rhel_subscribe/tasks/enterprise.yml | 11 | ||||
| -rw-r--r-- | roles/rhel_subscribe/tasks/main.yml | 2 |
2 files changed, 5 insertions, 8 deletions
diff --git a/roles/rhel_subscribe/tasks/enterprise.yml b/roles/rhel_subscribe/tasks/enterprise.yml index 39d59db70..9738929d2 100644 --- a/roles/rhel_subscribe/tasks/enterprise.yml +++ b/roles/rhel_subscribe/tasks/enterprise.yml @@ -3,20 +3,17 @@ command: subscription-manager repos --disable="*" - set_fact: - default_ose_version: '3.0' - when: deployment_type == 'enterprise' - -- set_fact: default_ose_version: '3.6' - when: deployment_type in ['atomic-enterprise', 'openshift-enterprise'] + when: deployment_type == 'openshift-enterprise' - set_fact: ose_version: "{{ lookup('oo_option', 'ose_version') | default(default_ose_version, True) }}" - fail: msg: "{{ ose_version }} is not a valid version for {{ deployment_type }} deployment type" - when: ( deployment_type == 'enterprise' and ose_version not in ['3.0'] ) or - ( deployment_type in ['atomic-enterprise', 'openshift-enterprise'] and ose_version not in ['3.1', '3.2', '3.3', '3.4', '3.5', '3.6'] ) + when: + - deployment_type == 'openshift-enterprise' + - ose_version not in ['3.1', '3.2', '3.3', '3.4', '3.5', '3.6'] ) - name: Enable RHEL repositories command: subscription-manager repos \ diff --git a/roles/rhel_subscribe/tasks/main.yml b/roles/rhel_subscribe/tasks/main.yml index 2a2cf40f3..c49512146 100644 --- a/roles/rhel_subscribe/tasks/main.yml +++ b/roles/rhel_subscribe/tasks/main.yml @@ -69,5 +69,5 @@ - include: enterprise.yml when: - - deployment_type in [ 'enterprise', 'atomic-enterprise', 'openshift-enterprise' ] + - deployment_type == 'openshift-enterprise' - not ostree_booted.stat.exists | bool |