diff options
| author | Tim Bielawa <timbielawa@gmail.com> | 2016-11-10 13:17:06 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-10 13:17:06 -0800 |
| commit | 9bf23fd0aafdfb13f4a444e2c1437d407421f50c (patch) | |
| tree | 9d415c47302d4651f6f115cbc17b3091bfb9114e /utils | |
| parent | b3ee4968a52166f4fe0b7bdb1f597be60c11d3da (diff) | |
| parent | e9a6f051df2606f8b22c0b2ca3ad2a324b70038e (diff) | |
| download | openshift-9bf23fd0aafdfb13f4a444e2c1437d407421f50c.tar.gz openshift-9bf23fd0aafdfb13f4a444e2c1437d407421f50c.tar.bz2 openshift-9bf23fd0aafdfb13f4a444e2c1437d407421f50c.tar.xz openshift-9bf23fd0aafdfb13f4a444e2c1437d407421f50c.zip | |
Merge pull request #2783 from tbielawa/aoioutput
Enable quiet output for all a-o-i commands
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/src/ooinstall/openshift_ansible.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/utils/src/ooinstall/openshift_ansible.py b/utils/src/ooinstall/openshift_ansible.py index 764cc1e56..f542fb376 100644 --- a/utils/src/ooinstall/openshift_ansible.py +++ b/utils/src/ooinstall/openshift_ansible.py @@ -314,6 +314,10 @@ def run_uninstall_playbook(hosts, verbose=False): facts_env['ANSIBLE_LOG_PATH'] = CFG.settings['ansible_log_path'] if 'ansible_config' in CFG.settings: facts_env['ANSIBLE_CONFIG'] = CFG.settings['ansible_config'] + # 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'] + return run_ansible(playbook, inventory_file, facts_env, verbose) @@ -328,4 +332,8 @@ def run_upgrade_playbook(hosts, playbook, verbose=False): facts_env['ANSIBLE_LOG_PATH'] = CFG.settings['ansible_log_path'] if 'ansible_config' in CFG.settings: facts_env['ANSIBLE_CONFIG'] = CFG.settings['ansible_config'] + # 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'] + return run_ansible(playbook, inventory_file, facts_env, verbose) |