diff options
author | Scott Dodson <sdodson@redhat.com> | 2017-01-08 17:15:03 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-08 17:15:03 -0500 |
commit | 1d5c152e7fd53d1aceefc13d7196c020d39f0e94 (patch) | |
tree | 84bf08816a9906fed30bf93b64875b42f16ec8d9 /roles/openshift_master_facts/lookup_plugins | |
parent | c7ae1238c186f8f91668493fffc9e4700c956366 (diff) | |
parent | aa053baa0151a33beeb6376835720dc677faf16d (diff) | |
download | openshift-1d5c152e7fd53d1aceefc13d7196c020d39f0e94.tar.gz openshift-1d5c152e7fd53d1aceefc13d7196c020d39f0e94.tar.bz2 openshift-1d5c152e7fd53d1aceefc13d7196c020d39f0e94.tar.xz openshift-1d5c152e7fd53d1aceefc13d7196c020d39f0e94.zip |
Merge pull request #3015 from smarterclayton/future_versions_master
Add future versions to openshift_facts
Diffstat (limited to 'roles/openshift_master_facts/lookup_plugins')
-rw-r--r-- | roles/openshift_master_facts/lookup_plugins/openshift_master_facts_default_predicates.py | 4 | ||||
-rw-r--r-- | roles/openshift_master_facts/lookup_plugins/openshift_master_facts_default_priorities.py | 4 |
2 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 4f7461827..b0984b004 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']: + if short_version not in ['1.1', '1.2', '1.3', '1.4', '1.5', '1.6']: 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']: + if short_version not in ['3.1', '3.2', '3.3', '3.4', '3.5', '3.6']: raise AnsibleError("Unknown short_version %s" % short_version) else: raise AnsibleError("Unknown deployment_type %s" % deployment_type) 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 7087ff03c..4d6572dae 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 @@ -45,10 +45,10 @@ class LookupModule(LookupBase): 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']: + if short_version not in ['1.1', '1.2', '1.3', '1.4', '1.5', '1.6']: 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']: + if short_version not in ['3.1', '3.2', '3.3', '3.4', '3.5', '3.6']: raise AnsibleError("Unknown short_version %s" % short_version) else: raise AnsibleError("Unknown deployment_type %s" % deployment_type) |