summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Bielawa <tbielawa@redhat.com>2016-11-10 08:37:13 -0800
committerTim Bielawa <tbielawa@redhat.com>2016-11-10 10:06:34 -0800
commite9a6f051df2606f8b22c0b2ca3ad2a324b70038e (patch)
treeb7de540402c367eb30e24379dc3568cce2b87f8e
parenta052d498950f473f2b854de25468aca516c4447d (diff)
downloadopenshift-e9a6f051df2606f8b22c0b2ca3ad2a324b70038e.tar.gz
openshift-e9a6f051df2606f8b22c0b2ca3ad2a324b70038e.tar.bz2
openshift-e9a6f051df2606f8b22c0b2ca3ad2a324b70038e.tar.xz
openshift-e9a6f051df2606f8b22c0b2ca3ad2a324b70038e.zip
Enable quiet output for all a-o-i commands
* Update: uninstall, upgrade, scaleup wf's * Verbosity can be toggled with -v flag, as before https://bugzilla.redhat.com/show_bug.cgi?id=1384294
-rw-r--r--utils/src/ooinstall/openshift_ansible.py8
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)