diff options
| author |   Markos Chandras <mchandras@suse.de> | 2017-09-26 15:55:23 +0100 |
|---|---|---|
| committer | Markos Chandras <mchandras@suse.de> | 2017-09-27 23:11:57 +0100 |
| commit | a8d88e586d9477f35556a397b59f82cabcc79c97 (patch) | |
| tree | 4cf5fc9431e5254843b3c7b14d74ffbc6509ef42 /bifrost/scripts | |
| parent | f6a885ffabd77ef9abb80c49d65772c97d9aee1e (diff) | |
xci: Replace ANSIBLE_VERBOSITY with XCI_ANSIBLE_VERBOSITY
The ANSIBLE_VERBOSITY env variable is actually used internally by
Ansible and exporting it actually makes Ansible super verbose even if
the variable is empty. This feature is going away in the future so we
introduce our own XCI_ANSIBLE_VERBOSITY variable which is simply passed
to the command line to control verbosity in a proper and deterministic
way.
Change-Id: I8a32eeb1a86b4cb0a9872a51bbe9f9624d096e39
Signed-off-by: Markos Chandras <mchandras@suse.de>
Diffstat (limited to 'bifrost/scripts')
| -rwxr-xr-x | bifrost/scripts/bifrost-provision.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/bifrost/scripts/bifrost-provision.sh b/bifrost/scripts/bifrost-provision.sh index d4d1f96a..bd9493e6 100755 --- a/bifrost/scripts/bifrost-provision.sh +++ b/bifrost/scripts/bifrost-provision.sh @@ -91,10 +91,10 @@ cd $BIFROST_HOME/playbooks # Syntax check of dynamic inventory test path for task in syntax-check list-tasks; do - ${ANSIBLE} -i inventory/localhost \ + ${ANSIBLE} ${XCI_ANSIBLE_VERBOSITY} -i inventory/localhost \ test-bifrost-create-vm.yaml \ --${task} - ${ANSIBLE} -i inventory/localhost \ + ${ANSIBLE} ${XCI_ANSIBLE_VERBOSITY} -i inventory/localhost \ ${TEST_PLAYBOOK} \ --${task} \ -e testing_user=${TESTING_USER} @@ -111,7 +111,8 @@ if [[ -e /etc/centos-release ]]; then fi # Create the VMS -${ANSIBLE} -i inventory/localhost \ +${ANSIBLE} ${XCI_ANSIBLE_VERBOSITY} \ + -i inventory/localhost \ test-bifrost-create-vm.yaml \ -e test_vm_num_nodes=${TEST_VM_NUM_NODES} \ -e test_vm_memory_size=${VM_MEMORY_SIZE} \ @@ -120,7 +121,8 @@ ${ANSIBLE} -i inventory/localhost \ -e ${INVENTORY_FILE_FORMAT}=${BAREMETAL_DATA_FILE} # Execute the installation and VM startup test -${ANSIBLE} -i inventory/bifrost_inventory.py \ +${ANSIBLE} ${XCI_ANSIBLE_VERBOSITY} \ + -i inventory/bifrost_inventory.py \ ${TEST_PLAYBOOK} \ -e use_cirros=${USE_CIRROS} \ -e testing_user=${TESTING_USER} \ |