From 01048382eb13ebb67a41c913e53ce165e92cb1a7 Mon Sep 17 00:00:00 2001
From: dalyd <david.daly@mongodb.com>
Date: Mon, 17 Oct 2016 17:01:15 -0400
Subject: SERVER-26689: Updated system-perf.yml and longevity.yml to use
 updated setup-cluster.sh

(cherry picked from commit 6e56f3f3cadc94dae09209df01098f8319835f19)
---
 etc/longevity.yml   |  2 +-
 etc/system_perf.yml | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'etc')

diff --git a/etc/longevity.yml b/etc/longevity.yml
index 34d2616567c..4e642ea39ad 100644
--- a/etc/longevity.yml
+++ b/etc/longevity.yml
@@ -63,7 +63,7 @@ functions:
           set -e
           set -o verbose
           cd ./clusters/${cluster}
-          ../../bin/setup-cluster.sh ${cluster}
+          ../../bin/setup-cluster.sh ${cluster} false
           echo "EC2 Cluster CREATED."
 
   "configure mongodb cluster":
diff --git a/etc/system_perf.yml b/etc/system_perf.yml
index e9d05938ed5..1f855a177a2 100644
--- a/etc/system_perf.yml
+++ b/etc/system_perf.yml
@@ -108,16 +108,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."
-- 
cgit v1.2.1