diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-05-24 09:46:33 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-05-25 10:28:32 -0300 |
| commit | 0c7433838c8c6409b8de907fcc946fc73fe90527 (patch) | |
| tree | 0e0138faf3cb685ac8dd51df79ee25f50c1111b6 /roles/openshift_facts/library | |
| parent | 82a70f9cc1522d239212701ab6c9260cbf9dc8a7 (diff) | |
| download | openshift-0c7433838c8c6409b8de907fcc946fc73fe90527.tar.gz openshift-0c7433838c8c6409b8de907fcc946fc73fe90527.tar.bz2 openshift-0c7433838c8c6409b8de907fcc946fc73fe90527.tar.xz openshift-0c7433838c8c6409b8de907fcc946fc73fe90527.zip | |
Work towards determining openshift_version when unspecified.
openshift_docker role was largely useless now, but also almost did what
we needed. (deps ordering still needs to be changed)
Remove defaulting of openshift_version.
Diffstat (limited to 'roles/openshift_facts/library')
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index 6127948bf..33596cd3e 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -1134,6 +1134,8 @@ def get_openshift_version(facts): _, output, _ = module.run_command(['/usr/bin/openshift', 'version']) version = parse_openshift_version(output) elif os.path.isfile('/usr/local/bin/openshift'): + # TODO: this should probably make sure the actual image is already present, this can take awhile if it has to pull + # and is falsely acting like openshift is already installed _, output, _ = module.run_command(['/usr/local/bin/openshift', 'version']) version = parse_openshift_version(output) |