Skip to content

Commit ae0c067

Browse files
authored
Bump terraform collection to fix race with waiting for ssh (#457)
* bump terraform collection to get azimuth-cloud/ansible-collection-terraform#16 * move terraform collection source to azimuth-cloud * update tasks to use azimuth_cloud terraform collection * fix conditional logic re. FIPs for caas
1 parent 53cdd44 commit ae0c067

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

ansible/roles/cluster_infra/tasks/main.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@
1010
# outputs.cluster_gateway_ip.
1111
- block:
1212
- name: Look up floating IP
13-
include_role:
14-
name: stackhpc.terraform.infra
15-
tasks_from: lookup_floating_ip
16-
vars:
17-
os_floating_ip_id: "{{ cluster_floating_ip }}"
13+
azimuth_cloud.terraform.os_floating_ip_info:
14+
floating_ip: "{{ cluster_floating_ip }}"
15+
register: cluster_floating_ip_info
1816

1917
- name: Set floating IP address fact
2018
set_fact:
21-
cluster_floating_ip_address: "{{ os_floating_ip_info.floating_ip_address }}"
22-
when: cluster_floating_ip is defined
19+
cluster_floating_ip_address: "{{ cluster_floating_ip_info.floating_ip.floating_ip_address }}"
20+
when:
21+
- cluster_floating_ip is defined
22+
- cluster_floating_ip
2323

2424
- name: Install Terraform binary
2525
include_role:
26-
name: stackhpc.terraform.install
26+
name: azimuth_cloud.terraform.install
2727

2828
- name: Make Terraform project directory
2929
file:
@@ -59,4 +59,4 @@
5959

6060
- name: Provision infrastructure
6161
include_role:
62-
name: stackhpc.terraform.infra
62+
name: azimuth_cloud.terraform.infra

requirements.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ collections:
4343
version: 3.7.2
4444
- name: openstack.cloud
4545
version: 2.1.0
46-
- name: https://github.com/stackhpc/ansible-collection-terraform
46+
- name: https://github.com/azimuth-cloud/ansible-collection-terraform
4747
type: git
48-
version: 0.2.0
48+
version: 0.4.0
4949
- name: https://github.com/azimuth-cloud/ansible-collection-image-utils
5050
type: git
5151
version: main # update on release

0 commit comments

Comments
 (0)