From a0f8680a71960ea9a69274bfd62ada0b58ae2c3c Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Thu, 23 Mar 2017 23:37:09 +0100 Subject: xci: Adjust how bifrost inventory files are specified First step towards creating env-vars files based on the use of these scripts so the scripts can be merged into one. Change-Id: I4ee1d9af520aa684a5367a2645d709835bc4a5a1 Signed-off-by: Fatih Degirmenci --- bifrost/scripts/test-bifrost-deployment.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'bifrost/scripts/test-bifrost-deployment.sh') diff --git a/bifrost/scripts/test-bifrost-deployment.sh b/bifrost/scripts/test-bifrost-deployment.sh index 83cf1cc1..f4d008b7 100755 --- a/bifrost/scripts/test-bifrost-deployment.sh +++ b/bifrost/scripts/test-bifrost-deployment.sh @@ -20,6 +20,8 @@ USE_VENV="false" BUILD_IMAGE=true PROVISION_WAIT_TIMEOUT=${PROVISION_WAIT_TIMEOUT:-3600} BAREMETAL_DATA_FILE=${BAREMETAL_DATA_FILE:-'/tmp/baremetal.json'} +INVENTORY_FILE_FORMAT="baremetal_json_file" +export BIFROST_INVENTORY_SOURCE=$BAREMETAL_DATA_FILE # Set defaults for ansible command-line options to drive the different # tests. @@ -50,9 +52,6 @@ INVENTORY_DHCP=false INVENTORY_DHCP_STATIC_IP=false WRITE_INTERFACES_FILE=true -# Set BIFROST_INVENTORY_SOURCE -export BIFROST_INVENTORY_SOURCE=/tmp/baremetal.json - # settings for console access export DIB_DEV_USER_PWDLESS_SUDO=yes export DIB_DEV_USER_PASSWORD=devuser @@ -106,7 +105,7 @@ ${ANSIBLE} -vvvv \ -e test_vm_memory_size=${VM_MEMORY_SIZE} \ -e enable_venv=${ENABLE_VENV} \ -e test_vm_domain_type=${VM_DOMAIN_TYPE} \ - -e baremetal_json_file=${BAREMETAL_DATA_FILE} + -e ${INVENTORY_FILE_FORMAT}=${BAREMETAL_DATA_FILE} # Execute the installation and VM startup test. ${ANSIBLE} -vvvv \ -- cgit 1.2.3-korg