diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-07 16:36:42 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-07 16:36:42 -0500 |
| commit | 44f443cd5afcad79c9afa49ff4f60c0448512f4f (patch) | |
| tree | 65aa2b1dfb02388d9a6b2d208ad10bc80193a85b /roles/openshift_facts | |
| parent | 484547222a9f4dfef8b97c965ce637c56a9fc2e6 (diff) | |
| parent | 64fa37b2b82b5f27fdbdca5a943e5c8158408e3d (diff) | |
| download | openshift-44f443cd5afcad79c9afa49ff4f60c0448512f4f.tar.gz openshift-44f443cd5afcad79c9afa49ff4f60c0448512f4f.tar.bz2 openshift-44f443cd5afcad79c9afa49ff4f60c0448512f4f.tar.xz openshift-44f443cd5afcad79c9afa49ff4f60c0448512f4f.zip | |
Merge pull request #1559 from brenton/bz1315151
BZ1315151: Support openshift_image_tag
Diffstat (limited to 'roles/openshift_facts')
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index 71e3284af..596e4f894 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -916,7 +916,7 @@ def get_openshift_version(facts, cli_image=None): if container is not None: exit_code, output, _ = module.run_command(['docker', 'exec', container, 'openshift', 'version']) - # if for some reason the container is installed by not running + # if for some reason the container is installed but not running # we'll fall back to using docker run later in this method. if exit_code == 0: version = parse_openshift_version(output) |