diff options
| author |   Markos Chandras <mchandras@suse.de> | 2016-09-27 16:35:57 +0100 |
|---|---|---|
| committer |   Trevor Bramwell <tbramwell@linuxfoundation.org> | 2017-08-11 12:56:12 -0700 |
| commit | 400193ba2ea3f26bacdb1d5ace2fe0d37de1ebf2 (patch) | |
| tree | 3399b56f129246a5e792e28e02e8d19767bc08c9 /bifrost | |
| parent | f320692972c7871dfb6899360bc16b82cc92dc3c (diff) | |
Set the wait_timeout variable to the deployment script
There is no point in us keeping our own copy of the upstream
bifrost-prepare-for-test-dynamic playbook just for overriding
the wait_timeout variable. Delete the duplicate role and move the
variable definition to the deployment script instead.
Change-Id: Ib8066fefe80e9a3190d878eb5dba7b8d86a85e07
Signed-off-by: Markos Chandras <mchandras@suse.de>
Diffstat (limited to 'bifrost')
| -rw-r--r-- | bifrost/playbooks/roles/bifrost-prepare-for-test-dynamic/defaults/main.yml | 4 | ||||
| -rwxr-xr-x | bifrost/scripts/test-bifrost-deployment.sh | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/bifrost/playbooks/roles/bifrost-prepare-for-test-dynamic/defaults/main.yml b/bifrost/playbooks/roles/bifrost-prepare-for-test-dynamic/defaults/main.yml deleted file mode 100644 index 69eb787e..00000000 --- a/bifrost/playbooks/roles/bifrost-prepare-for-test-dynamic/defaults/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -node_ssh_pause: 10 -wait_timeout: 1900 -multinode_testing: false diff --git a/bifrost/scripts/test-bifrost-deployment.sh b/bifrost/scripts/test-bifrost-deployment.sh index fb49afc4..773697ef 100755 --- a/bifrost/scripts/test-bifrost-deployment.sh +++ b/bifrost/scripts/test-bifrost-deployment.sh @@ -18,6 +18,7 @@ ENABLE_VENV="false" USE_DHCP="false" USE_VENV="false" BUILD_IMAGE=true +PROVISION_WAIT_TIMEOUT=${PROVISION_WAIT_TIMEOUT:-2400} # Set defaults for ansible command-line options to drive the different # tests. @@ -114,7 +115,8 @@ ${ANSIBLE} -vvvv \ -e download_ipa=${DOWNLOAD_IPA} \ -e create_ipa_image=${CREATE_IPA_IMAGE} \ -e write_interfaces_file=${WRITE_INTERFACES_FILE} \ - -e ipv4_gateway=192.168.122.1 + -e ipv4_gateway=192.168.122.1 \ + -e wait_timeout=${PROVISION_WAIT_TIMEOUT} EXITCODE=$? if [ $EXITCODE != 0 ]; then |