diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-03 08:33:00 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-03 08:33:00 -0500 |
| commit | fe320d7e67f88b214d34bfb958cabfe08dd294ca (patch) | |
| tree | 30bb7e11574ae8b3d450f4f3d484795483fe7773 | |
| parent | 055366e7bfa789eae0dce5c638afb8cde143a0dc (diff) | |
| parent | b8334348d07473c426cb1441ffbddbf743b352b1 (diff) | |
| download | openshift-fe320d7e67f88b214d34bfb958cabfe08dd294ca.tar.gz openshift-fe320d7e67f88b214d34bfb958cabfe08dd294ca.tar.bz2 openshift-fe320d7e67f88b214d34bfb958cabfe08dd294ca.tar.xz openshift-fe320d7e67f88b214d34bfb958cabfe08dd294ca.zip | |
Merge pull request #1537 from abutcher/bz1313169-oadm
Check for is_containerized value when setting binary locations.
| -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 0f25881f1..7b2715bb0 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -1090,7 +1090,7 @@ def set_container_facts_if_unset(facts): if 'ovs_image' not in facts['node']: facts['node']['ovs_image'] = ovs_image - if facts['common']['is_containerized']: + if bool(strtobool(str(facts['common']['is_containerized']))): facts['common']['admin_binary'] = '/usr/local/bin/oadm' facts['common']['client_binary'] = '/usr/local/bin/oc' |