diff options
| author | dalyd <david.daly@mongodb.com> | 2016-10-17 17:01:15 -0400 |
|---|---|---|
| committer | dalyd <david.daly@mongodb.com> | 2016-10-19 15:23:18 -0400 |
| commit | 6e56f3f3cadc94dae09209df01098f8319835f19 (patch) | |
| tree | e87337375a5b1e4495f687da84c4462524789992 /etc | |
| parent | f4d1637a254075c82f6b2a390c31d290819376db (diff) | |
| download | mongo-6e56f3f3cadc94dae09209df01098f8319835f19.tar.gz | |
SERVER-26689: Updated system-perf.yml and longevity.yml to use updated setup-cluster.sh
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/longevity.yml | 2 | ||||
| -rw-r--r-- | etc/system_perf.yml | 12 |
2 files changed, 5 insertions, 9 deletions
diff --git a/etc/longevity.yml b/etc/longevity.yml index 16e8827f87c..f39ed19cc15 100644 --- a/etc/longevity.yml +++ b/etc/longevity.yml @@ -98,7 +98,7 @@ functions: set -e set -o verbose source ./dsienv.sh - $DSI_PATH/bin/setup-cluster.sh ${cluster} ../terraform + $DSI_PATH/bin/setup-cluster.sh ${cluster} false "configure mongodb cluster": - command: shell.exec diff --git a/etc/system_perf.yml b/etc/system_perf.yml index 80d8db36ec8..0884a282854 100644 --- a/etc/system_perf.yml +++ b/etc/system_perf.yml @@ -118,16 +118,12 @@ functions: set -o verbose source ./dsienv.sh if [ ! -e $HOME/infrastructure_provisioning/terraform/provisioned.${cluster} ]; then - echo "Provisinging new resources." - $DSI_PATH/bin/setup-cluster.sh ${cluster} ../terraform + EXISTING="false" else - # on host with pre-existing resources, call terraform directly to - # avoid recreating instances due to terraform apply concurrency limitation - echo "Update expire-on tag for existing resources." - ./terraform apply -var-file=cluster.json - # call env.sh to generate ips.sh, etc. for downstream modules - $DSI_PATH/bin/env.sh + EXISTING="true" fi + + $DSI_PATH/bin/setup-cluster.sh ${cluster} $EXISTING # handle the case when setup-cluster.sh fail if [ $? -eq 0 ]; then echo "Resource provisioned/updated." |