From b1cc016cc03c192d9b10fd375c3b9b98126d3438 Mon Sep 17 00:00:00 2001 From: Romain Lalaut Date: Mon, 14 Jul 2025 08:58:24 +0200 Subject: [PATCH] dd external_openstack_lbaas_member_subnet_id variable to external-openstack-cloud-config.j2 (#12267) --- docs/cloud_controllers/openstack.md | 1 + .../external_cloud_controller/openstack/defaults/main.yml | 2 ++ .../openstack/templates/external-openstack-cloud-config.j2 | 1 + 3 files changed, 4 insertions(+) diff --git a/docs/cloud_controllers/openstack.md b/docs/cloud_controllers/openstack.md index 2f07b64e8..7a80ff713 100644 --- a/docs/cloud_controllers/openstack.md +++ b/docs/cloud_controllers/openstack.md @@ -73,6 +73,7 @@ The cloud provider is configured to have Octavia by default in Kubespray. external_openstack_lbaas_method: ROUND_ROBIN external_openstack_lbaas_provider: amphora external_openstack_lbaas_subnet_id: "Neutron subnet ID to create LBaaS VIP" + external_openstack_lbaas_member_subnet_id: "Neutron subnet ID on which to create the members of the load balancer" external_openstack_lbaas_network_id: "Neutron network ID to create LBaaS VIP" external_openstack_lbaas_manage_security_groups: false external_openstack_lbaas_create_monitor: false diff --git a/roles/kubernetes-apps/external_cloud_controller/openstack/defaults/main.yml b/roles/kubernetes-apps/external_cloud_controller/openstack/defaults/main.yml index 6b57fc3de..1fda72ed2 100644 --- a/roles/kubernetes-apps/external_cloud_controller/openstack/defaults/main.yml +++ b/roles/kubernetes-apps/external_cloud_controller/openstack/defaults/main.yml @@ -24,3 +24,5 @@ external_openstack_cloud_controller_extra_args: {} external_openstack_cloud_controller_image_tag: "v1.32.0" external_openstack_cloud_controller_bind_address: 127.0.0.1 external_openstack_cloud_controller_dns_policy: ClusterFirst + +external_openstack_lbaas_member_subnet_id: "{{ external_openstack_lbaas_subnet_id }}" diff --git a/roles/kubernetes-apps/external_cloud_controller/openstack/templates/external-openstack-cloud-config.j2 b/roles/kubernetes-apps/external_cloud_controller/openstack/templates/external-openstack-cloud-config.j2 index 08acd6706..bf8379ef5 100644 --- a/roles/kubernetes-apps/external_cloud_controller/openstack/templates/external-openstack-cloud-config.j2 +++ b/roles/kubernetes-apps/external_cloud_controller/openstack/templates/external-openstack-cloud-config.j2 @@ -45,6 +45,7 @@ lb-provider={{ external_openstack_lbaas_provider }} {% endif %} {% if external_openstack_lbaas_subnet_id is defined %} subnet-id={{ external_openstack_lbaas_subnet_id }} +member-subnet-id={{ external_openstack_lbaas_member_subnet_id }} {% endif %} {% if external_openstack_lbaas_network_id is defined %} network-id={{ external_openstack_lbaas_network_id }}