From 44b389bc5af56a2d3e7cfb432434b471a645d801 Mon Sep 17 00:00:00 2001
From: Markos Chandras <mchandras@suse.de>
Date: Tue, 27 Sep 2016 16:35:57 +0100
Subject: 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>
---
.../roles/bifrost-prepare-for-test-dynamic/defaults/main.yml | 4 ----
prototypes/bifrost/scripts/test-bifrost-deployment.sh | 4 +++-
2 files changed, 3 insertions(+), 5 deletions(-)
delete mode 100644 prototypes/bifrost/playbooks/roles/bifrost-prepare-for-test-dynamic/defaults/main.yml
diff --git a/prototypes/bifrost/playbooks/roles/bifrost-prepare-for-test-dynamic/defaults/main.yml b/prototypes/bifrost/playbooks/roles/bifrost-prepare-for-test-dynamic/defaults/main.yml
deleted file mode 100644
index 69eb787e7..000000000
--- a/prototypes/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/prototypes/bifrost/scripts/test-bifrost-deployment.sh b/prototypes/bifrost/scripts/test-bifrost-deployment.sh
index fb49afc42..773697efe 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
+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
--
cgit