diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2017-02-08 22:31:28 +0100 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2017-02-08 22:53:58 +0100 |
| commit | c4c39c1fcbc619c2a6495e4abec5e455f5f61965 (patch) | |
| tree | be32c86e67dc5178884f5db3286345fd926c4fd4 | |
| parent | bf32924f7d1e229d7022f0a102f483c82536e30b (diff) | |
| download | openshift-c4c39c1fcbc619c2a6495e4abec5e455f5f61965.tar.gz openshift-c4c39c1fcbc619c2a6495e4abec5e455f5f61965.tar.bz2 openshift-c4c39c1fcbc619c2a6495e4abec5e455f5f61965.tar.xz openshift-c4c39c1fcbc619c2a6495e4abec5e455f5f61965.zip | |
fixup! master: latest use same priorities as last version
| -rw-r--r-- | roles/openshift_master_facts/lookup_plugins/openshift_master_facts_default_priorities.py | 5 |
1 files changed, 4 insertions, 1 deletions
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 ea54b44d2..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}, @@ -88,7 +91,7 @@ class LookupModule(LookupBase): {'name': 'InterPodAffinityPriority', 'weight': 1} ]) - if short_version in ['1.5', '1.6', 'latest']: + if short_version in ['1.5', '1.6']: priorities.extend([ {'name': 'SelectorSpreadPriority', 'weight': 1}, {'name': 'InterPodAffinityPriority', 'weight': 1}, |