diff options
| author | Tim Bielawa <tbielawa@redhat.com> | 2016-09-26 12:03:36 -0700 |
|---|---|---|
| committer | Tim Bielawa <tbielawa@redhat.com> | 2016-09-29 07:47:19 -0700 |
| commit | 76f1cd09097dc28c9efe7e2476534fb8a9cfede5 (patch) | |
| tree | bf2f300034818b1952c5066a56dbdcba0bc8c31f /utils/src/ooinstall/openshift_ansible.py | |
| parent | 088e4ba10dfec171618890ef022c7e86476823bc (diff) | |
| download | openshift-76f1cd09097dc28c9efe7e2476534fb8a9cfede5.tar.gz openshift-76f1cd09097dc28c9efe7e2476534fb8a9cfede5.tar.bz2 openshift-76f1cd09097dc28c9efe7e2476534fb8a9cfede5.tar.xz openshift-76f1cd09097dc28c9efe7e2476534fb8a9cfede5.zip | |
'fix' unittests by removing the users ability to specify an ansible config
Diffstat (limited to 'utils/src/ooinstall/openshift_ansible.py')
| -rw-r--r-- | utils/src/ooinstall/openshift_ansible.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/utils/src/ooinstall/openshift_ansible.py b/utils/src/ooinstall/openshift_ansible.py index 79c60af82..eb1e61a60 100644 --- a/utils/src/ooinstall/openshift_ansible.py +++ b/utils/src/ooinstall/openshift_ansible.py @@ -286,9 +286,10 @@ def run_main_playbook(inventory_file, hosts, hosts_to_run_on, verbose=False): facts_env = os.environ.copy() if 'ansible_log_path' in CFG.settings: facts_env['ANSIBLE_LOG_PATH'] = CFG.settings['ansible_log_path'] + + # override the ansible config for our main playbook run if 'ansible_quiet_config' in CFG.settings: facts_env['ANSIBLE_CONFIG'] = CFG.settings['ansible_quiet_config'] - # facts_env["ANSIBLE_CALLBACK_PLUGINS"] = CFG.settings['ansible_plugins_directory'] return run_ansible(main_playbook_path, inventory_file, facts_env, verbose) |