fixup! master: latest use same predicates as 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
 
@@ -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'},