Merge pull request #378 from NHSDigital/apm-2545-timeout-terraform-locks-on-ecs-deploys

acarriedev · web-flow · commit 100d0af6da01 · 2021-10-11T15:32:03.000+01:00
APM-2545 Add expiry time to terraform lock on ECS container deploys
diff --git a/ansible/roles/create-api-deployment-pre-reqs/tasks/main.yml b/ansible/roles/create-api-deployment-pre-reqs/tasks/main.yml
@@ -36,13 +36,13 @@
       when: item.state == 'file'
 
     - name: terraform plan
-      shell: "make -C {{ out_dir }}/terraform clean plan args='-no-color -out tfplan.out'" # noqa 305
+      shell: "make -C {{ out_dir }}/terraform clean plan args='-no-color -lock-timeout=30m -out tfplan.out'" # noqa 305
       register: tfplan
       failed_when: tfplan.rc not in (0, 2)
       when: not do_not_terraform
 
     - name: terraform apply
-      shell: "make -C {{ out_dir }}/terraform apply-plan args='-no-color --auto-approve tfplan.out'" # noqa 305
+      shell: "make -C {{ out_dir }}/terraform apply-plan args='-no-color -lock-timeout=30m --auto-approve tfplan.out'" # noqa 305
       register: tfapply
       when: not do_not_terraform
 
diff --git a/ansible/roles/deploy-ecs-proxies/tasks/main.yml b/ansible/roles/deploy-ecs-proxies/tasks/main.yml
@@ -72,13 +72,13 @@
       when: item.state == 'file'
 
     - name: terraform plan
-      shell: "make -C {{ out_dir }}/terraform clean plan args='-no-color -out tfplan.out'" # noqa 305
+      shell: "make -C {{ out_dir }}/terraform clean plan args='-no-color -lock-timeout=30m -out tfplan.out'" # noqa 305
       register: tfplan
       failed_when: tfplan.rc not in (0, 2)
       when: not do_not_terraform
 
     - name: terraform apply
-      shell: "make -C {{ out_dir }}/terraform apply-plan args='-no-color --auto-approve tfplan.out'" # noqa 305
+      shell: "make -C {{ out_dir }}/terraform apply-plan args='-no-color -lock-timeout=30m --auto-approve tfplan.out'" # noqa 305
       register: tfapply
       when: not do_not_terraform
 
diff --git a/ansible/roles/destroy-api-deployment-pre-reqs/tasks/main.yml b/ansible/roles/destroy-api-deployment-pre-reqs/tasks/main.yml
@@ -42,7 +42,7 @@
       when: not do_not_terraform
 
     - name: terraform destroy
-      shell: "make -C {{ out_dir }}/terraform apply args='-no-color --auto-approve' tf-command=destroy" # noqa 305
+      shell: "make -C {{ out_dir }}/terraform apply args='-no-color -lock-timeout=30m --auto-approve' tf-command=destroy" # noqa 305
       register: tfapply
       when: not do_not_terraform
 
diff --git a/ansible/roles/destroy-ecs-proxies/tasks/main.yml b/ansible/roles/destroy-ecs-proxies/tasks/main.yml
@@ -75,7 +75,7 @@
       when: not do_not_terraform
 
     - name: terraform destroy
-      shell: "make -C {{ out_dir }}/terraform apply args='-no-color --auto-approve' tf-command=destroy" # noqa 305
+      shell: "make -C {{ out_dir }}/terraform apply args='-no-color -lock-timeout=30m --auto-approve' tf-command=destroy" # noqa 305
       register: tfapply
       when: not do_not_terraform
 
