Merge pull request #3287 from giuseppe/scheduler-config-file

latest: use same priorities and predicates used by the last version

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
 

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},