From e286a9a4aad9bfca02e35c2486414d33a4f053d7 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Mon, 12 Mar 2018 09:47:55 +0000 Subject: xci: Rename XCI_ANSIBLE_VERBOSITY to XCI_ANSIBLE_PARAMS We don't quite need a specific env variable just for Ansible verbosity so we can rename this variable to make it clear that it can be used to pass any Ansible option to XCI. Change-Id: Ie20517d4b563bfc6daeb27848168d36da7014cee Signed-off-by: Markos Chandras --- bifrost/scripts/bifrost-provision.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'bifrost') diff --git a/bifrost/scripts/bifrost-provision.sh b/bifrost/scripts/bifrost-provision.sh index 726a4da4..67d5e2d8 100755 --- a/bifrost/scripts/bifrost-provision.sh +++ b/bifrost/scripts/bifrost-provision.sh @@ -21,7 +21,7 @@ BUILD_IMAGE=true PROVISION_WAIT_TIMEOUT=${PROVISION_WAIT_TIMEOUT:-3600} # This is normally exported by XCI env but we should initialize it here # in case we run this script on its own for debug purposes -XCI_ANSIBLE_VERBOSITY=${XCI_ANSIBLE_VERBOSITY:-} +XCI_ANSIBLE_PARAMS=${XCI_ANSIBLE_PARAMS:-} # Ironic SHAs BIFROST_IRONIC_INSPECTOR_VERSION=${BIFROST_IRONIC_INSPECTOR_VERSION:-master} BIFROST_IRONIC_INSPECTOR_CLIENT_VERSION=${BIFROST_IRONIC_INSPECTOR_CLIENT_VERSION:-master} @@ -132,7 +132,7 @@ if [[ -e /etc/centos-release ]]; then fi # Create the VMS -${ANSIBLE} ${XCI_ANSIBLE_VERBOSITY} \ +${ANSIBLE} ${XCI_ANSIBLE_PARAMS} \ -i inventory/localhost \ test-bifrost-create-vm.yaml \ -e test_vm_num_nodes=${TEST_VM_NUM_NODES} \ @@ -143,7 +143,7 @@ ${ANSIBLE} ${XCI_ANSIBLE_VERBOSITY} \ -e ${INVENTORY_FILE_FORMAT}=${BAREMETAL_DATA_FILE} # Execute the installation and VM startup test -${ANSIBLE} ${XCI_ANSIBLE_VERBOSITY} \ +${ANSIBLE} ${XCI_ANSIBLE_PARAMS} \ -i inventory/bifrost_inventory.py \ ${TEST_PLAYBOOK} \ -e use_cirros=${USE_CIRROS} \ -- cgit 1.2.3-korg