summaryrefslogtreecommitdiffstats
path: root/roles/openshift_sanitize_inventory
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-09-20 13:45:52 -0700
committerGitHub <noreply@github.com>2017-09-20 13:45:52 -0700
commit457e0f80784820b9ff0fb6a7407c271731f5b1d9 (patch)
tree0f6bab549ae71ae7dd073381e3f7ff8545d3c8a5 /roles/openshift_sanitize_inventory
parent4f5839e585a78243eae2d215176047299c52a1eb (diff)
parent4b8f66c37b865c7be59310854f5f9bd3de3e01bb (diff)
downloadopenshift-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 'roles/openshift_sanitize_inventory')
-rw-r--r--roles/openshift_sanitize_inventory/vars/main.yml7
1 files changed, 2 insertions, 5 deletions
diff --git a/roles/openshift_sanitize_inventory/vars/main.yml b/roles/openshift_sanitize_inventory/vars/main.yml
index da48e42c1..37e88758d 100644
--- a/roles/openshift_sanitize_inventory/vars/main.yml
+++ b/roles/openshift_sanitize_inventory/vars/main.yml
@@ -1,7 +1,4 @@
---
# origin uses community packages named 'origin'
-# online currently uses 'openshift' packages
-# enterprise is used for OSE 3.0 < 3.1 which uses packages named 'openshift'
-# atomic-enterprise uses Red Hat packages named 'atomic-openshift'
-# openshift-enterprise uses Red Hat packages named 'atomic-openshift' starting with OSE 3.1
-known_openshift_deployment_types: ['origin', 'online', 'enterprise', 'atomic-enterprise', 'openshift-enterprise']
+# openshift-enterprise uses Red Hat packages named 'atomic-openshift'
+known_openshift_deployment_types: ['origin', 'openshift-enterprise']