summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-02-10 14:17:41 -0500
committerGitHub <noreply@github.com>2017-02-10 14:17:41 -0500
commita4f64f2452d980580823a0676282e25eb0dec561 (patch)
tree6a3566b65403f35b2519aa8e8f36d3421e475590 /roles
parent0826250be3d0fe2b6ae7e68dcc975d9937a4100a (diff)
parente0a41641d796192c0b2e739f645b037304b9f926 (diff)
downloadopenshift-a4f64f2452d980580823a0676282e25eb0dec561.tar.gz
openshift-a4f64f2452d980580823a0676282e25eb0dec561.tar.bz2
openshift-a4f64f2452d980580823a0676282e25eb0dec561.tar.xz
openshift-a4f64f2452d980580823a0676282e25eb0dec561.zip
Merge pull request #3287 from giuseppe/scheduler-config-file
latest: use same priorities and predicates used by the last version
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_master_facts/lookup_plugins/openshift_master_facts_default_predicates.py3
-rw-r--r--roles/openshift_master_facts/lookup_plugins/openshift_master_facts_default_priorities.py3
2 files changed, 6 insertions, 0 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 0c94228c6..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
diff --git a/roles/openshift_master_facts/lookup_plugins/openshift_master_facts_default_priorities.py b/roles/openshift_master_facts/lookup_plugins/openshift_master_facts_default_priorities.py
index 95ace7923..6ad40e748 100644
--- a/roles/openshift_master_facts/lookup_plugins/openshift_master_facts_default_priorities.py
+++ b/roles/openshift_master_facts/lookup_plugins/openshift_master_facts_default_priorities.py
@@ -53,6 +53,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'
+
if short_version == '1.1':
priorities.extend([
{'name': 'LeastRequestedPriority', 'weight': 1},