summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-08-18 18:52:51 +0200
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-08-19 09:32:59 +0200
commit8b2dbcaaf1ab658c9c81b8025e2fb056fc67484f (patch)
tree40052ea6cddc1acc898f5760c65e9f45cdf15c72
parent0f7c6ec50c15197d2d040aa1ea5ef18cde0fc4e7 (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--prototypes/bifrost/.gitkeep0
-rw-r--r--prototypes/bifrost/playbooks/roles/bifrost-prepare-for-test-dynamic/defaults/main.yml4
-rwxr-xr-x[-rw-r--r--]prototypes/bifrost/scripts/destroy_env.sh0
-rwxr-xr-x[-rw-r--r--]prototypes/bifrost/scripts/test-bifrost-deployment.sh0
4 files changed, 4 insertions, 0 deletions
diff --git a/prototypes/bifrost/.gitkeep b/prototypes/bifrost/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
--- a/prototypes/bifrost/.gitkeep
+++ /dev/null
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
new file mode 100644
index 000000000..69eb787e7
--- /dev/null
+++ b/prototypes/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/prototypes/bifrost/scripts/destroy_env.sh b/prototypes/bifrost/scripts/destroy_env.sh
index aef4ccba3..aef4ccba3 100644..100755
--- a/prototypes/bifrost/scripts/destroy_env.sh
+++ b/prototypes/bifrost/scripts/destroy_env.sh
diff --git a/prototypes/bifrost/scripts/test-bifrost-deployment.sh b/prototypes/bifrost/scripts/test-bifrost-deployment.sh
index ecd05e07b..ecd05e07b 100644..100755
--- a/prototypes/bifrost/scripts/test-bifrost-deployment.sh
+++ b/prototypes/bifrost/scripts/test-bifrost-deployment.sh