Merge "xci: Configure ansible verbosity based on job type"

diff --combined jjb/xci/xci-daily-jobs.yml
index 1f4e50b,7519bac..dbe3b65
--- 1/jjb/xci/xci-daily-jobs.yml
--- 2/jjb/xci/xci-daily-jobs.yml
+++ b/jjb/xci/xci-daily-jobs.yml
@@@ -61,6 -61,19 +61,6 @@@
              dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
              extra-dib-elements: 'openssh-server'
  
 -#--------------------------------
 -# VM defaults
 -#--------------------------------
 -- defaults:
 -    name: daily_vm_defaults
 -    test-vm-num-nodes: '6'
 -    test-vm-node-names: 'xcimaster controller00 controller01 controller02 compute00 compute01'
 -    vm-domain-type: 'kvm'
 -    vm-cpu: '8'
 -    vm-disk: '100'
 -    vm-memory-size: '16384'
 -    vm-disk-cache: 'unsafe'
 -
  #--------------------------------
  #        Phases
  #--------------------------------
@@@ -75,19 -88,6 +75,19 @@@
          - 'xci-{scenario}-{pod}-{distro}-daily-{stream}'
          - 'xci-{phase}-{pod}-{distro}-daily-{stream}'
  
 +#--------------------------------
 +# VM defaults
 +#--------------------------------
 +- defaults:
 +    name: daily_vm_defaults
 +    test-vm-num-nodes: '6'
 +    test-vm-node-names: 'xcimaster controller00 controller01 controller02 compute00 compute01'
 +    vm-domain-type: 'kvm'
 +    vm-cpu: '8'
 +    vm-disk: '100'
 +    vm-memory-size: '16384'
 +    vm-disk-cache: 'unsafe'
 +
  #--------------------------------
  # job templates
  #--------------------------------
@@@ -254,6 -254,9 +254,9 @@@
          - label:
              name: SLAVE_LABEL
              default: '{slave-label}'
+         - string:
+             name: ANSIBLE_VERBOSITY
+             default: ''
  
      wrappers:
          - xci-fix-perms-workspace