diff options
| author |   Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2017-03-24 08:19:05 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-03-24 08:19:05 +0000 |
| commit | 8b15725dc3a5df11bb3f62b054ee5454f4506ba4 (patch) | |
| tree | 06838893eb3fec807011c721e66e245bb61a8b84 /prototypes | |
| parent | e87c89a144107c0f764458942a174e4563082f03 (diff) | |
| parent | a14250f3699d5e94e7e9906195c0b76fefcc8d83 (diff) | |
Merge "xci: Adjust how bifrost inventory files are specified"
Diffstat (limited to 'prototypes')
| -rwxr-xr-x | prototypes/bifrost/scripts/osa-bifrost-deployment.sh | 10 | ||||
| -rwxr-xr-x | prototypes/bifrost/scripts/test-bifrost-deployment.sh | 7 |
2 files changed, 10 insertions, 7 deletions
diff --git a/prototypes/bifrost/scripts/osa-bifrost-deployment.sh b/prototypes/bifrost/scripts/osa-bifrost-deployment.sh index fb66ae9e3..30090bf75 100755 --- a/prototypes/bifrost/scripts/osa-bifrost-deployment.sh +++ b/prototypes/bifrost/scripts/osa-bifrost-deployment.sh @@ -23,10 +23,13 @@ PROVISION_WAIT_TIMEOUT=${PROVISION_WAIT_TIMEOUT:-3600} # ensure the right inventory files is used based on branch CURRENT_BIFROST_BRANCH=$(git rev-parse --abbrev-ref HEAD) if [ $CURRENT_BIFROST_BRANCH = "master" ]; then - export BIFROST_INVENTORY_SOURCE=${BIFROST_INVENTORY_SOURCE:-'/tmp/baremetal.json'} + BAREMETAL_DATA_FILE=${BAREMETAL_DATA_FILE:-'/tmp/baremetal.json'} + INVENTORY_FILE_FORMAT="baremetal_json_file" else - export BIFROST_INVENTORY_SOURCE=${BIFROST_INVENTORY_SOURCE:-'/tmp/baremetal.csv'} + BAREMETAL_DATA_FILE=${BAREMETAL_DATA_FILE:-'/tmp/baremetal.csv'} + INVENTORY_FILE_FORMAT="baremetal_csv_file" fi +export BIFROST_INVENTORY_SOURCE=$BAREMETAL_DATA_FILE # Set defaults for ansible command-line options to drive the different # tests. @@ -113,7 +116,8 @@ ${ANSIBLE} \ -e test_vm_num_nodes=${TEST_VM_NUM_NODES} \ -e test_vm_memory_size=${VM_MEMORY_SIZE} \ -e enable_venv=${ENABLE_VENV} \ - -e test_vm_domain_type=${VM_DOMAIN_TYPE} + -e test_vm_domain_type=${VM_DOMAIN_TYPE} \ + -e ${INVENTORY_FILE_FORMAT}=${BAREMETAL_DATA_FILE} # Execute the installation and VM startup test. ${ANSIBLE} \ 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 \ |