Chef stack updates for daemon-instance provisioning

wjordan · wjordan · commit 390a488841e2 · 2017-11-27T16:43:41.000-08:00
- Don't fail stack update when daemon-instance provisioning fails.
- Don't re-run user-data shell script on daemon instance.
- Increase daemon-instance timeout to 2 hours.
[ci skip]
diff --git a/aws/cloudformation/bootstrap_chef_stack.sh.erb b/aws/cloudformation/bootstrap_chef_stack.sh.erb
@@ -1,9 +1,11 @@
 #!/bin/bash -x
 # UserData bootstrap script for CloudFormation stack instances.
 
+<% unless daemon -%>
 # Modify cloud-init to re-run this user-data script every time instance restarts.
 # Ref: http://stackoverflow.com/a/10455027
 sed -i 's/scripts-user$/\[scripts-user, always\]/' /etc/cloud/cloud.cfg
+<% end -%>
 
 # Bootstrap prerequisites
 apt-get update
@@ -70,10 +72,12 @@ JSON
 # Provision via Chef.
 OPTIONS="<%=local_mode ? '-z ' : ''%> -b $BRANCH -n $NODE_NAME -r '$RUN_LIST' -e $ENVIRONMENT"
 sudo -u ubuntu bash -c "aws s3 cp s3://$S3_BUCKET/chef/bootstrap-$STACK.sh - | sudo bash -s -- $OPTIONS"
-[ $? -eq 0 ] && STATUS=SUCCESS || STATUS=FAILURE
+[ $? -eq 0 ] && STATUS=SUCCESS || STATUS=<%=daemon ? 'SUCCESS' : 'FAILURE'%>
 
+<% unless daemon -%>
 # Workaround for version-controlled files modified by seed.
 sudo -u ubuntu bash -c "cd /home/ubuntu/$ENVIRONMENT && git reset --hard"
+<% end -%>
 
 # Signal CloudFormation resource.
 aws cloudformation signal-resource \
diff --git a/aws/cloudformation/cloud_formation_stack.yml.erb b/aws/cloudformation/cloud_formation_stack.yml.erb
@@ -464,7 +464,7 @@ Resources:
     Type: AWS::EC2::Instance
     CreationPolicy:
       ResourceSignal:
-        Timeout: PT60M
+        Timeout: PT2H
     Properties:
       ImageId: <%=image_id%>
       InstanceType: !Ref InstanceType
