From 4c36f38a8f7d676f8d96a793669e0cbbf062eb94 Mon Sep 17 00:00:00 2001 From: Matt Pryor Date: Tue, 12 Dec 2023 13:36:24 +0000 Subject: [PATCH 1/2] Make sure delete can proceed without CAPI (#262) --- roles/capi_cluster/tasks/main.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/roles/capi_cluster/tasks/main.yml b/roles/capi_cluster/tasks/main.yml index b4f48b1e7..d85e53fa6 100644 --- a/roles/capi_cluster/tasks/main.yml +++ b/roles/capi_cluster/tasks/main.yml @@ -120,8 +120,12 @@ --for=delete --namespace {{ capi_cluster_release_namespace }} --timeout 0s - changed_when: false register: capi_cluster_delete + changed_when: false + # Allow for the case where we never got as far as installing the CAPI controllers + failed_when: >- + capi_cluster_delete.rc != 0 and + "the server doesn't have a resource type" not in capi_cluster_delete.stderr until: capi_cluster_delete is succeeded # Wait up to 60 mins for the cluster to delete retries: 360 From f4c73ae841bd8b301867eab7b795a03f6934d65c Mon Sep 17 00:00:00 2001 From: Matt Pryor Date: Wed, 13 Dec 2023 10:56:06 +0000 Subject: [PATCH 2/2] Add support for specifying Azimuth net templates (#266) --- roles/azimuth/defaults/main.yml | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/roles/azimuth/defaults/main.yml b/roles/azimuth/defaults/main.yml index ea7967a45..be325e06d 100644 --- a/roles/azimuth/defaults/main.yml +++ b/roles/azimuth/defaults/main.yml @@ -215,6 +215,16 @@ azimuth_openstack_domain: default azimuth_openstack_interface: public # Whether or not to verify SSL azimuth_openstack_verify_ssl: true +# The template to use when searching for the internal network +# Only used if the internal network is not tagged +# If given, network auto-creation is disabled +# The fragment '{tenant_name}' is replaced with the current tenancy name, e.g. "{tenant_name}-internal" +azimuth_openstack_internal_net_template: +# The template to use when searching for the external network +# Only used if the external network is not tagged +# If not given, there must be exactly one external network available to tenants +# The fragment '{tenant_name}' is replaced with the current tenancy name, e.g. "{tenant_name}-external" +azimuth_openstack_external_net_template: # Indicates whether tenant internal networks should be auto-created if not present azimuth_openstack_create_internal_net: true # The CIDR to use for auto-created tenant internal networks @@ -233,11 +243,21 @@ azimuth_openstack_provider: >- "createInternalNet": azimuth_openstack_create_internal_net, "internalNetCidr": azimuth_openstack_internal_net_cidr } | - combine( - { "internalNetDNSNameservers": azimuth_openstack_internal_net_dns_nameservers } - if azimuth_openstack_internal_net_dns_nameservers | length > 0 - else {} - ) + combine( + { "internalNetTemplate": azimuth_openstack_internal_net_template } + if azimuth_openstack_internal_net_template + else {} + ) | + combine( + { "externalNetTemplate": azimuth_openstack_external_net_template } + if azimuth_openstack_external_net_template + else {} + ) | + combine( + { "internalNetDNSNameservers": azimuth_openstack_internal_net_dns_nameservers } + if azimuth_openstack_internal_net_dns_nameservers | length > 0 + else {} + ) }} # App proxy settings