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/common/openshift-cluster | |
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/common/openshift-cluster')
-rw-r--r-- | playbooks/common/openshift-cluster/upgrades/pre/verify_inventory_vars.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/pre/verify_inventory_vars.yml b/playbooks/common/openshift-cluster/upgrades/pre/verify_inventory_vars.yml index 9a959a959..3c0017891 100644 --- a/playbooks/common/openshift-cluster/upgrades/pre/verify_inventory_vars.yml +++ b/playbooks/common/openshift-cluster/upgrades/pre/verify_inventory_vars.yml @@ -5,9 +5,9 @@ tasks: - fail: msg: > - This upgrade is only supported for origin, openshift-enterprise, and online + This upgrade is only supported for origin and openshift-enterprise deployment types - when: deployment_type not in ['origin','openshift-enterprise', 'online'] + when: deployment_type not in ['origin','openshift-enterprise'] # Error out in situations where the user has older versions specified in their # inventory in any of the openshift_release, openshift_image_tag, and |