Skip to content

Commit

Permalink
Bump terraform collection to fix race with waiting for ssh (#457)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
sjpb authored Oct 22, 2024
1 parent 53cdd44 commit ae0c067
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
18 changes: 9 additions & 9 deletions ansible/roles/cluster_infra/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,20 @@
# outputs.cluster_gateway_ip.
- block:
- name: Look up floating IP
include_role:
name: stackhpc.terraform.infra
tasks_from: lookup_floating_ip
vars:
os_floating_ip_id: "{{ cluster_floating_ip }}"
azimuth_cloud.terraform.os_floating_ip_info:
floating_ip: "{{ cluster_floating_ip }}"
register: cluster_floating_ip_info

- name: Set floating IP address fact
set_fact:
cluster_floating_ip_address: "{{ os_floating_ip_info.floating_ip_address }}"
when: cluster_floating_ip is defined
cluster_floating_ip_address: "{{ cluster_floating_ip_info.floating_ip.floating_ip_address }}"
when:
- cluster_floating_ip is defined
- cluster_floating_ip

- name: Install Terraform binary
include_role:
name: stackhpc.terraform.install
name: azimuth_cloud.terraform.install

- name: Make Terraform project directory
file:
Expand Down Expand Up @@ -59,4 +59,4 @@

- name: Provision infrastructure
include_role:
name: stackhpc.terraform.infra
name: azimuth_cloud.terraform.infra
4 changes: 2 additions & 2 deletions requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ collections:
version: 3.7.2
- name: openstack.cloud
version: 2.1.0
- name: https://github.com/stackhpc/ansible-collection-terraform
- name: https://github.com/azimuth-cloud/ansible-collection-terraform
type: git
version: 0.2.0
version: 0.4.0
- name: https://github.com/azimuth-cloud/ansible-collection-image-utils
type: git
version: main # update on release
Expand Down

0 comments on commit ae0c067

Please sign in to comment.