Browse Source

fixup! master: latest use same priorities as last version

Giuseppe Scrivano 8 years ago
parent
commit
c4c39c1fcb

+ 4 - 1
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},