diff options
| author |   Markos Chandras <mchandras@suse.de> | 2017-03-09 18:21:13 +0000 |
|---|---|---|
| committer | Markos Chandras <mchandras@suse.de> | 2017-03-09 18:59:36 +0000 |
| commit | 4c3461eed917211268dc173e3d54ecebae6724e3 (patch) | |
| tree | c0d0a8a3f107b4aa56420ae5b9b4766706583d96 /prototypes/bifrost | |
| parent | 3ec2c2b06b992f24e578f7f4441a36e2363ccd73 (diff) | |
prototypes: bifrost: Switch to JSON for inventory
Upstream commit 3aaed64e88e3 ("Use JSON baremetal data in testing")
switched from CSV to JSON for the inventory file in order to support
the *_ipmitool drivers and virtualbmc. This commit mimics the upstream
one.
Depends-On: Ib5c4e1465a67a819c9d495b0e0a64addeb0294cb
Change-Id: If66810db445cf997c5eb61090815abe186e002fa
Signed-off-by: Markos Chandras <mchandras@suse.de>
Diffstat (limited to 'prototypes/bifrost')
| -rwxr-xr-x | prototypes/bifrost/scripts/test-bifrost-deployment.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/prototypes/bifrost/scripts/test-bifrost-deployment.sh b/prototypes/bifrost/scripts/test-bifrost-deployment.sh index 3e2381fea..a47415091 100755 --- a/prototypes/bifrost/scripts/test-bifrost-deployment.sh +++ b/prototypes/bifrost/scripts/test-bifrost-deployment.sh @@ -18,6 +18,7 @@ ENABLE_VENV="false" USE_DHCP="false" USE_VENV="false" BUILD_IMAGE=true +BAREMETAL_DATA_FILE=${BAREMETAL_DATA_FILE:-'/tmp/baremetal.json'} PROVISION_WAIT_TIMEOUT=${PROVISION_WAIT_TIMEOUT:-3600} # Set defaults for ansible command-line options to drive the different @@ -50,7 +51,7 @@ INVENTORY_DHCP_STATIC_IP=false WRITE_INTERFACES_FILE=true # Set BIFROST_INVENTORY_SOURCE -export BIFROST_INVENTORY_SOURCE=/tmp/baremetal.csv +export BIFROST_INVENTORY_SOURCE=/tmp/baremetal.json # DIB custom elements path export ELEMENTS_PATH=/usr/share/diskimage-builder/elements:/opt/puppet-infracloud/files/elements @@ -107,7 +108,8 @@ ${ANSIBLE} -vvvv \ -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 baremetal_json_file=${BAREMETAL_DATA_FILE} # Execute the installation and VM startup test. ${ANSIBLE} -vvvv \ |