summaryrefslogtreecommitdiffstats
path: root/utils/src/ooinstall
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2015-11-16 12:03:47 -0400
committerDevan Goodwin <dgoodwin@redhat.com>2015-11-16 12:03:47 -0400
commit037950923abd5188977e825d994f14111b0e6a89 (patch)
tree42fec834dc8b8cd7f9bc1ed2f77402ec87200cc2 /utils/src/ooinstall
parentf33f2d789c58e334449060ce532d7a2785f79e7c (diff)
downloadopenshift-037950923abd5188977e825d994f14111b0e6a89.tar.gz
openshift-037950923abd5188977e825d994f14111b0e6a89.tar.bz2
openshift-037950923abd5188977e825d994f14111b0e6a89.tar.xz
openshift-037950923abd5188977e825d994f14111b0e6a89.zip
Fix tests on systems with openshift-ansible rpms installed.
Diffstat (limited to 'utils/src/ooinstall')
-rw-r--r--utils/src/ooinstall/cli_installer.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py
index 3c3f45c3b..3b5dbaf0e 100644
--- a/utils/src/ooinstall/cli_installer.py
+++ b/utils/src/ooinstall/cli_installer.py
@@ -458,7 +458,8 @@ def cli(ctx, unattended, configuration, ansible_playbook_directory, ansible_conf
if ctx.obj['ansible_config']:
oo_cfg.settings['ansible_config'] = ctx.obj['ansible_config']
- elif os.path.exists(DEFAULT_ANSIBLE_CONFIG):
+ elif 'ansible_config' not in oo_cfg.settings and \
+ os.path.exists(DEFAULT_ANSIBLE_CONFIG):
# If we're installed by RPM this file should exist and we can use it as our default:
oo_cfg.settings['ansible_config'] = DEFAULT_ANSIBLE_CONFIG