Bläddra i källkod

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
Tim Bielawa 8 år sedan
förälder
incheckning
e9a6f051df
1 ändrade filer med 8 tillägg och 0 borttagningar
  1. 8 0
      utils/src/ooinstall/openshift_ansible.py

+ 8 - 0
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)