diff options
| author |   Markos Chandras <mchandras@suse.de> | 2018-03-13 16:20:20 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-03-13 16:20:20 +0000 |
| commit | 193e3c4784824d647541d079c54ab2d1460f9e88 (patch) | |
| tree | 3224cda88e1d8f3e8756b2cc7745cbf358d46dee /bifrost | |
| parent | c6ea45f88ce8c11e7b0e35b6d1c8cf233ebd556c (diff) | |
| parent | 6514b1ac8b4cc5b98085776546077cd588d0739e (diff) | |
Merge changes from topics 'allow-pass-ansible-arguments', 'allow-pass-ansible-arguments-force-verify'
* changes:
xci: OSA: Fix warning about missing inventory file
xci: Pass the XCI_PATH variable to all Ansible calls
xci: Rename XCI_ANSIBLE_VERBOSITY to XCI_ANSIBLE_PARAMS
Diffstat (limited to 'bifrost')
| -rwxr-xr-x | bifrost/scripts/bifrost-provision.sh | 6 |
1 files changed, 3 insertions, 3 deletions
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} \ |