Skip to content

Master -> Edge add lock-duration timeout to tfm apply/plan #379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
acarriedev merged 4 commits into from
Oct 12, 2021
Merged

Master -> Edge add lock-duration timeout to tfm apply/plan #379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b2e8de4
APM-2545 Add lock-timeout flag to plan and apply terraform steps
acarriedev Oct 8, 2021
04ac29b
APM-2545 Mov placement of -lock-timeout flag
acarriedev Oct 11, 2021
c621ff5
APM-2545 Add -lock-timeout=30m to other apply/plan commands
acarriedev Oct 11, 2021
100d0af
Merge pull request #378 from NHSDigital/apm-2545-timeout-terraform-lo…
acarriedev Oct 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ansible/roles/create-api-deployment-pre-reqs/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions ansible/roles/deploy-ecs-proxies/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/destroy-api-deployment-pre-reqs/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/destroy-ecs-proxies/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down