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 /filter_plugins/oo_filters.py | |
| 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 'filter_plugins/oo_filters.py')
| -rw-r--r-- | filter_plugins/oo_filters.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/filter_plugins/oo_filters.py b/filter_plugins/oo_filters.py index 277695f78..902436302 100644 --- a/filter_plugins/oo_filters.py +++ b/filter_plugins/oo_filters.py @@ -877,10 +877,8 @@ def oo_pods_match_component(pods, deployment_type, component): raise errors.AnsibleFilterError("failed expects component to be a string") image_prefix = 'openshift/origin-' - if deployment_type in ['enterprise', 'online', 'openshift-enterprise']: + if deployment_type == 'openshift-enterprise': image_prefix = 'openshift3/ose-' - elif deployment_type == 'atomic-enterprise': - image_prefix = 'aep3_beta/aep-' matching_pods = [] image_regex = image_prefix + component + r'.*' |