set external_openstack_lbaas_use_octavia in default values

kubernetes-sigs · Feb 24, 2021 · 118fc5c · 118fc5c
1 parent 4f4f14d
commit 118fc5c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/docs/openstack.md b/docs/openstack.md
@@ -138,6 +138,7 @@ The new cloud provider is configured to have Octavia by default in Kubespray.
   external_openstack_lbaas_monitor_timeout: "30s"
   external_openstack_lbaas_monitor_max_retries: "3"
   external_openstack_lbaas_provider: octavia
+  external_openstack_lbaas_use_octavia: false
   external_openstack_lbaas_use_octavia: true
   external_openstack_lbaas_network_id: "Neutron network ID to create LBaaS VIP"
   external_openstack_lbaas_subnet_id: "Neutron subnet ID to create LBaaS VIP"

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
@@ -57,7 +57,7 @@ internal-lb={{ external_openstack_lbaas_internal_lb }}
 {% endif %}
 {% if external_openstack_lbaas_provider is defined %}
 lb-provider={{ external_openstack_lbaas_provider }}
-use-octavia={{ external_openstack_lbaas_use_octavia | default(False) }}
+use-octavia={{ external_openstack_lbaas_use_octavia }}
 {% else %}
 lb-provider=octavia
 use-octavia=true

diff --git a/roles/kubespray-defaults/defaults/main.yaml b/roles/kubespray-defaults/defaults/main.yaml
@@ -386,6 +386,7 @@ 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_lbaas_use_octavia: false
 external_openstack_network_internal_networks:
 - ""
 external_openstack_network_public_networks: