diff options
| author | Jason DeTiberus <jdetiber@redhat.com> | 2016-12-07 15:36:42 -0500 |
|---|---|---|
| committer | Jason DeTiberus <jdetiber@redhat.com> | 2016-12-07 15:36:42 -0500 |
| commit | 9b6f24f271e0776f68073f72a10fb9f83d264cee (patch) | |
| tree | 1b88e3641a713a7a34ae793f285a5f002d34c540 /roles/openshift_master_facts/lookup_plugins | |
| parent | 4a720359613da16a9cd4ed547dddccee14735aa0 (diff) | |
| download | openshift-9b6f24f271e0776f68073f72a10fb9f83d264cee.tar.gz openshift-9b6f24f271e0776f68073f72a10fb9f83d264cee.tar.bz2 openshift-9b6f24f271e0776f68073f72a10fb9f83d264cee.tar.xz openshift-9b6f24f271e0776f68073f72a10fb9f83d264cee.zip | |
Properly handle x.y.z formatted versions for openshift_release
Diffstat (limited to 'roles/openshift_master_facts/lookup_plugins')
| -rw-r--r-- | roles/openshift_master_facts/lookup_plugins/openshift_master_facts_default_predicates.py | 1 | ||||
| -rw-r--r-- | roles/openshift_master_facts/lookup_plugins/openshift_master_facts_default_priorities.py | 1 |
2 files changed, 2 insertions, 0 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 6aa9af74c..6255ef6eb 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 @@ -32,6 +32,7 @@ class LookupModule(LookupBase): short_version = release[1:] else: short_version = release + short_version = '.'.join(short_version.split('.')[0:2]) elif 'openshift_version' in variables: version = variables['openshift_version'] short_version = '.'.join(version.split('.')[0:2]) 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 7c0ba4388..7087ff03c 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 @@ -36,6 +36,7 @@ class LookupModule(LookupBase): short_version = release[1:] else: short_version = release + short_version = '.'.join(short_version.split('.')[0:2]) elif 'openshift_version' in variables: version = variables['openshift_version'] short_version = '.'.join(version.split('.')[0:2]) |