Add additional network configuration options to external Openstack CCM (

kubernetes-sigs#6083)
Sryther · May 16, 2020 · 4d3b607 · 4d3b607
1 parent 3997aa9
commit 4d3b607
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/inventory/sample/group_vars/all/openstack.yml b/inventory/sample/group_vars/all/openstack.yml
@@ -28,6 +28,11 @@
 # external_openstack_lbaas_monitor_max_retries: "3"
 # external_openstack_lbaas_manage_security_groups: false
 # external_openstack_lbaas_internal_lb: false
+# external_openstack_network_ipv6_disabled: false
+# external_openstack_network_internal_networks:
+#   - ""
+# external_openstack_network_public_networks:
+#   - ""
 
 ## The tag of the external OpenStack Cloud Controller image
 # external_openstack_cloud_controller_image_tag: "latest"

diff --git a/...tes-apps/external_cloud_controller/openstack/templates/external-openstack-cloud-config.j2 b/...tes-apps/external_cloud_controller/openstack/templates/external-openstack-cloud-config.j2
@@ -48,3 +48,12 @@ internal-lb={{ external_openstack_lbaas_internal_lb }}
 {% if external_openstack_lbaas_use_octavia is defined and external_openstack_lbaas_use_octavia %}
 lb-provider=octavia
 {% endif %}
+
+[Network]
+ipv6-support-disabled={{ external_openstack_network_ipv6_disabled | string | lower }}
+{% for network_name in external_openstack_network_internal_networks %}
+internal-network-name="{{ network_name }}"
+{% endfor %}
+{% for network_name in external_openstack_network_public_networks %}
+public-network-name="{{ network_name }}"
+{% endfor %}
diff --git a/roles/kubespray-defaults/defaults/main.yaml b/roles/kubespray-defaults/defaults/main.yaml
@@ -351,6 +351,11 @@ external_openstack_lbaas_create_monitor: false
 external_openstack_lbaas_monitor_delay: "1m"
 external_openstack_lbaas_monitor_timeout: "30s"
 external_openstack_lbaas_monitor_max_retries: "3"
+external_openstack_network_ipv6_disabled: false
+external_openstack_network_internal_networks:
+  - ""
+external_openstack_network_public_networks:
+  - ""
 
 ## List of authorization modes that must be configured for
 ## the k8s cluster. Only 'AlwaysAllow', 'AlwaysDeny', 'Node' and