From 8b2dbcaaf1ab658c9c81b8025e2fb056fc67484f Mon Sep 17 00:00:00 2001
From: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Date: Thu, 18 Aug 2016 18:52:51 +0200
Subject: 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>
---
 prototypes/bifrost/.gitkeep                                           | 0
 .../roles/bifrost-prepare-for-test-dynamic/defaults/main.yml          | 4 ++++
 prototypes/bifrost/scripts/destroy_env.sh                             | 0
 prototypes/bifrost/scripts/test-bifrost-deployment.sh                 | 0
 4 files changed, 4 insertions(+)
 delete mode 100644 prototypes/bifrost/.gitkeep
 create mode 100644 prototypes/bifrost/playbooks/roles/bifrost-prepare-for-test-dynamic/defaults/main.yml
 mode change 100644 => 100755 prototypes/bifrost/scripts/destroy_env.sh
 mode change 100644 => 100755 prototypes/bifrost/scripts/test-bifrost-deployment.sh

(limited to 'prototypes/bifrost')

diff --git a/prototypes/bifrost/.gitkeep b/prototypes/bifrost/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
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
old mode 100644
new mode 100755
diff --git a/prototypes/bifrost/scripts/test-bifrost-deployment.sh b/prototypes/bifrost/scripts/test-bifrost-deployment.sh
old mode 100644
new mode 100755
-- 
cgit