From f5bd27eaad19eea9b4a9372527a4ef8b93a68025 Mon Sep 17 00:00:00 2001 From: Matt Pryor Date: Fri, 9 Jun 2023 12:17:36 +0100 Subject: [PATCH] Remove unnecessary variable --- .../inventory/group_vars/all/variables.yml | 2 +- environments/capi-mgmt/inventory/group_vars/all.yml | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/environments/capi-mgmt-example/inventory/group_vars/all/variables.yml b/environments/capi-mgmt-example/inventory/group_vars/all/variables.yml index c628d1d3..a10b6672 100644 --- a/environments/capi-mgmt-example/inventory/group_vars/all/variables.yml +++ b/environments/capi-mgmt-example/inventory/group_vars/all/variables.yml @@ -6,7 +6,7 @@ # infra_network_cidr: 192.168.100.0/24 # The ID of the external network to connect to via a router -# By default, the first available network will be used +# By default, if there is exactly one external network then it will be used # infra_external_network_id: "" # The image id of an Ubuntu 20.04 image to use for the node diff --git a/environments/capi-mgmt/inventory/group_vars/all.yml b/environments/capi-mgmt/inventory/group_vars/all.yml index 4fe019f3..86bfdf6a 100644 --- a/environments/capi-mgmt/inventory/group_vars/all.yml +++ b/environments/capi-mgmt/inventory/group_vars/all.yml @@ -3,16 +3,6 @@ infra_name: "capi-mgmt-{{ azimuth_environment }}{{ '-seed' if install_mode == 'h # Give the HA cluster a name corresponding to the environment capi_cluster_release_name: "capi-mgmt-{{ azimuth_environment }}" -# Use the first available external network by default -infra_external_network_id: >- - {{ - lookup('pipe', 'openstack network list --external -f json') | - from_json | - first | - default(undef(hint = 'Unable to find external network')) | - json_query('ID') - }} - # The size in GB for the data volume # This will hold all cluster data, including Kubernetes resources infra_data_volume_size: 50