diff options
author | Scott Dodson <sdodson@redhat.com> | 2017-08-03 15:08:27 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-03 15:08:27 -0400 |
commit | 05a9c91735cc95457411dbb19951341e5418df18 (patch) | |
tree | f9c9bb750370732e83daedb36e44aa199aaceccb /roles/openshift_master_facts/lookup_plugins/openshift_master_facts_default_predicates.py | |
parent | 1765ce2bb6ab28a14c60dd5c268ec97ed788a1c1 (diff) | |
parent | 1fdf6048f45bf64fbdd4a74ebe40ec45ff06d016 (diff) | |
download | openshift-05a9c91735cc95457411dbb19951341e5418df18.tar.gz openshift-05a9c91735cc95457411dbb19951341e5418df18.tar.bz2 openshift-05a9c91735cc95457411dbb19951341e5418df18.tar.xz openshift-05a9c91735cc95457411dbb19951341e5418df18.zip |
Merge pull request #4988 from stevekuznetsov/skuznets/tolerate-3.7
Update version checks to tolerate 3.7
Diffstat (limited to 'roles/openshift_master_facts/lookup_plugins/openshift_master_facts_default_predicates.py')
-rw-r--r-- | roles/openshift_master_facts/lookup_plugins/openshift_master_facts_default_predicates.py | 8 |
1 files changed, 4 insertions, 4 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 b50d6d9db..c45f255af 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 @@ -40,10 +40,10 @@ class LookupModule(LookupBase): # pylint: disable=line-too-long raise AnsibleError("Either OpenShift needs to be installed or openshift_release needs to be specified") if deployment_type == 'origin': - if short_version not in ['1.1', '1.2', '1.3', '1.4', '1.5', '3.6', 'latest']: + if short_version not in ['1.1', '1.2', '1.3', '1.4', '1.5', '3.6', '3.7', 'latest']: raise AnsibleError("Unknown short_version %s" % short_version) elif deployment_type == 'openshift-enterprise': - if short_version not in ['3.1', '3.2', '3.3', '3.4', '3.5', '3.6', 'latest']: + if short_version not in ['3.1', '3.2', '3.3', '3.4', '3.5', '3.6', '3.7', 'latest']: raise AnsibleError("Unknown short_version %s" % short_version) else: raise AnsibleError("Unknown deployment_type %s" % deployment_type) @@ -53,7 +53,7 @@ class LookupModule(LookupBase): short_version = re.sub('^1.', '3.', short_version) if short_version == 'latest': - short_version = '3.6' + short_version = '3.7' # Predicates ordered according to OpenShift Origin source: # origin/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/algorithmprovider/defaults/defaults.go @@ -101,7 +101,7 @@ class LookupModule(LookupBase): {'name': 'MatchInterPodAffinity'} ]) - if short_version in ['3.5', '3.6']: + if short_version in ['3.5', '3.6', '3.7']: predicates.extend([ {'name': 'NoVolumeZoneConflict'}, {'name': 'MaxEBSVolumeCount'}, |