From b2e8de46c348dde74e8c975730f67b7a04bcd8a1 Mon Sep 17 00:00:00 2001 From: Alex Carrie Date: Fri, 8 Oct 2021 16:15:43 +0100 Subject: [PATCH 1/3] APM-2545 Add lock-timeout flag to plan and apply terraform steps --- ansible/roles/deploy-ecs-proxies/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/roles/deploy-ecs-proxies/tasks/main.yml b/ansible/roles/deploy-ecs-proxies/tasks/main.yml index 40df23a27..107df40a0 100644 --- 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 -out -lock-timeout=30m 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 --auto-approve -lock-timeout=30m tfplan.out'" # noqa 305 register: tfapply when: not do_not_terraform From 04ac29bf2bfc245b8eb18fb54d8f91d8416f83c8 Mon Sep 17 00:00:00 2001 From: Alex Carrie Date: Mon, 11 Oct 2021 11:31:18 +0100 Subject: [PATCH 2/3] APM-2545 Mov placement of -lock-timeout flag --- ansible/roles/deploy-ecs-proxies/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/roles/deploy-ecs-proxies/tasks/main.yml b/ansible/roles/deploy-ecs-proxies/tasks/main.yml index 107df40a0..668c8cb0e 100644 --- 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 -lock-timeout=30m 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 -lock-timeout=30m 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 From c621ff59d3ad92bea361bd9615a30f22af8893cb Mon Sep 17 00:00:00 2001 From: Alex Carrie Date: Mon, 11 Oct 2021 15:20:14 +0100 Subject: [PATCH 3/3] APM-2545 Add -lock-timeout=30m to other apply/plan commands --- ansible/roles/create-api-deployment-pre-reqs/tasks/main.yml | 4 ++-- ansible/roles/destroy-api-deployment-pre-reqs/tasks/main.yml | 2 +- ansible/roles/destroy-ecs-proxies/tasks/main.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ansible/roles/create-api-deployment-pre-reqs/tasks/main.yml b/ansible/roles/create-api-deployment-pre-reqs/tasks/main.yml index 999cdf3c0..d1b3f221c 100644 --- 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/destroy-api-deployment-pre-reqs/tasks/main.yml b/ansible/roles/destroy-api-deployment-pre-reqs/tasks/main.yml index 240043f54..5f57e2aff 100644 --- 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 index d75147d80..427745f7f 100644 --- 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