Merge pull request #19 from skyscrapers/bluegreenApplyApprove

Enable terraform apply autoapprove in bluegreen deplyos
skyscrapers · Jan 2, 2018 · 33e08a4 · 33e08a4
2 parents 96cb24e + 3c9e674
commit 33e08a4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/bluegreen.py b/bluegreen.py
@@ -89,7 +89,7 @@ def main(argv):
     # Retrieve autoscaling groups information (we need to do this again because the launchconig has changed and we need this in a later phase)
     info = getAutoscalingInfo(agBlue, agGreen)
 
-    if command == 'apply':
+    if 'apply' in command:
         print 'Waiting for 30 seconds to get autoscaling status'
         time.sleep(30)
         timeout = 30

diff --git a/deploy-bluegreen.yml b/deploy-bluegreen.yml
@@ -45,4 +45,4 @@ run:
     terraform init
     terraform workspace select $TF_ENVIRONMENT
     # Deploy
-    $WORKDIR/terraform-bluegreen/bluegreen.py -f $WORKDIR/terraform-repo/$TF_PROJECT_FOLDER -a $AMI_ID -c apply -t 500 -e $WORKDIR/terraform-repo/$TF_PROJECT_FOLDER/$TF_ENVIRONMENT.tfvars
+    $WORKDIR/terraform-bluegreen/bluegreen.py -f $WORKDIR/terraform-repo/$TF_PROJECT_FOLDER -a $AMI_ID -c "apply -auto-approve" -t 500 -e $WORKDIR/terraform-repo/$TF_PROJECT_FOLDER/$TF_ENVIRONMENT.tfvars