diff options
| author |   Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2016-08-19 19:44:40 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-08-19 19:44:41 +0000 |
| commit | 52c3cb5a643064865e6c86e0c366d8d5097d2a15 (patch) | |
| tree | aa118451e240a4f92b7e464df9a196a537858539 | |
| parent | 23f9930c322b13a1996b6e927b126bfb3d0acf8a (diff) | |
| parent | 8b2dbcaaf1ab658c9c81b8025e2fb056fc67484f (diff) | |
Merge "Adjust bifrost node provisioning timeout and fix file permissions"
| -rw-r--r-- | prototypes/bifrost/.gitkeep | 0 | ||||
| -rw-r--r-- | prototypes/bifrost/playbooks/roles/bifrost-prepare-for-test-dynamic/defaults/main.yml | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | prototypes/bifrost/scripts/destroy_env.sh | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | prototypes/bifrost/scripts/test-bifrost-deployment.sh | 0 |
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 807d823e0..807d823e0 100644..100755 --- a/prototypes/bifrost/scripts/test-bifrost-deployment.sh +++ b/prototypes/bifrost/scripts/test-bifrost-deployment.sh |