summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2017-02-08 22:31:38 +0100
committerGiuseppe Scrivano <gscrivan@redhat.com>2017-02-08 22:54:44 +0100
commite0a41641d796192c0b2e739f645b037304b9f926 (patch)
tree2627ef284367d8eb6ad4d725f0f43d08d464a4a6 /roles
parentc4c39c1fcbc619c2a6495e4abec5e455f5f61965 (diff)
downloadopenshift-e0a41641d796192c0b2e739f645b037304b9f926.tar.gz
openshift-e0a41641d796192c0b2e739f645b037304b9f926.tar.bz2
openshift-e0a41641d796192c0b2e739f645b037304b9f926.tar.xz
openshift-e0a41641d796192c0b2e739f645b037304b9f926.zip
fixup! master: latest use same predicates as last version
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_master_facts/lookup_plugins/openshift_master_facts_default_predicates.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/roles/openshift_master_facts/lookup_plugins/openshift_master_facts_default_predicates.py b/roles/openshift_master_facts/lookup_plugins/openshift_master_facts_default_predicates.py
index d1a08fe37..ef322bd7d 100644
--- a/roles/openshift_master_facts/lookup_plugins/openshift_master_facts_default_predicates.py
+++ b/roles/openshift_master_facts/lookup_plugins/openshift_master_facts_default_predicates.py
@@ -52,6 +52,9 @@ class LookupModule(LookupBase):
# convert short_version to origin short_version
short_version = re.sub('^3.', '1.', short_version)
+ if short_version == 'latest':
+ short_version = '1.6'
+
# Predicates ordered according to OpenShift Origin source:
# origin/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/algorithmprovider/defaults/defaults.go
@@ -98,7 +101,7 @@ class LookupModule(LookupBase):
{'name': 'MatchInterPodAffinity'}
])
- if short_version in ['1.5', '1.6', 'latest']:
+ if short_version in ['1.5', '1.6']:
predicates.extend([
{'name': 'NoVolumeZoneConflict'},
{'name': 'MaxEBSVolumeCount'},