diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-09-20 13:45:52 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-20 13:45:52 -0700 |
| commit | 457e0f80784820b9ff0fb6a7407c271731f5b1d9 (patch) | |
| tree | 0f6bab549ae71ae7dd073381e3f7ff8545d3c8a5 /playbooks/byo | |
| parent | 4f5839e585a78243eae2d215176047299c52a1eb (diff) | |
| parent | 4b8f66c37b865c7be59310854f5f9bd3de3e01bb (diff) | |
| download | openshift-457e0f80784820b9ff0fb6a7407c271731f5b1d9.tar.gz openshift-457e0f80784820b9ff0fb6a7407c271731f5b1d9.tar.bz2 openshift-457e0f80784820b9ff0fb6a7407c271731f5b1d9.tar.xz openshift-457e0f80784820b9ff0fb6a7407c271731f5b1d9.zip | |
Merge pull request #5378 from mgugino-upstream-stage/cleanup-deployment-types
Automatic merge from submit-queue
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.yml | 12 |
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 |