summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-08-18 18:52:51 +0200
committerTrevor Bramwell <tbramwell@linuxfoundation.org>2017-08-11 12:56:12 -0700
commit81ed220f6ba8a1a3b27a24a5465d13c081b82d39 (patch)
tree526e313bbd3add9872805197eff25e616c169d99
parent056775a92f6a5126178708a8de5d725c31dec42f (diff)
Adjust bifrost node provisioning timeout and fix file permissions
This change - increases the node provisioning timeout to 1900 seconds since the original timeout used by upstream bifrost (900 seconds) is not suited for provisioning VMs with Ubuntu. - fixes permissions of the scripts. - removes .gitkeep. This change is not upstreamed since bifrost uses cirros for test & development purposes and it is probably not in their interest to have increased timeout. Change-Id: I4b59a321fa26f8b5895ec577a19d10f5cdcace0f Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
-rw-r--r--bifrost/.gitkeep0
-rw-r--r--bifrost/playbooks/roles/bifrost-prepare-for-test-dynamic/defaults/main.yml4
-rwxr-xr-x[-rw-r--r--]bifrost/scripts/destroy_env.sh0
-rwxr-xr-x[-rw-r--r--]bifrost/scripts/test-bifrost-deployment.sh0
4 files changed, 4 insertions, 0 deletions
diff --git a/bifrost/.gitkeep b/bifrost/.gitkeep
deleted file mode 100644
index e69de29b..00000000
--- a/bifrost/.gitkeep
+++ /dev/null
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
new file mode 100644
index 00000000..69eb787e
--- /dev/null
+++ b/bifrost/playbooks/roles/bifrost-prepare-for-test-dynamic/defaults/main.yml
@@ -0,0 +1,4 @@
+---
+node_ssh_pause: 10
+wait_timeout: 1900
+multinode_testing: false
diff --git a/bifrost/scripts/destroy_env.sh b/bifrost/scripts/destroy_env.sh
index aef4ccba..aef4ccba 100644..100755
--- a/bifrost/scripts/destroy_env.sh
+++ b/bifrost/scripts/destroy_env.sh
diff --git a/bifrost/scripts/test-bifrost-deployment.sh b/bifrost/scripts/test-bifrost-deployment.sh
index ecd05e07..ecd05e07 100644..100755
--- a/bifrost/scripts/test-bifrost-deployment.sh
+++ b/bifrost/scripts/test-bifrost-deployment.sh