diff options
| author |   Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2017-03-23 23:37:09 +0100 |
|---|---|---|
| committer | Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2017-03-24 00:14:18 +0100 |
| commit | a14250f3699d5e94e7e9906195c0b76fefcc8d83 (patch) | |
| tree | b5220647e6543e4c9c71ec1498a009b06f28fcee /prototypes/bifrost/scripts/test-bifrost-deployment.sh | |
| parent | bb8bda1d99551746003796f7393316f802644797 (diff) | |
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 <fatih.degirmenci@ericsson.com>
Diffstat (limited to 'prototypes/bifrost/scripts/test-bifrost-deployment.sh')
| -rwxr-xr-x | prototypes/bifrost/scripts/test-bifrost-deployment.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/prototypes/bifrost/scripts/test-bifrost-deployment.sh b/prototypes/bifrost/scripts/test-bifrost-deployment.sh index 83cf1cc1b..f4d008b71 100755 --- a/prototypes/bifrost/scripts/test-bifrost-deployment.sh +++ b/prototypes/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 \ |