From e41766fd584ab0fa183c8771c03958c74eddf2c4 Mon Sep 17 00:00:00 2001
From: qvicksilver <jonathan@sofiero.net>
Date: Wed, 29 Apr 2020 20:30:25 +0200
Subject: [PATCH] Fix broken Octavia integration in OpenStack External Cloud
 Provider (#6046)

---
 .../openstack/templates/external-openstack-cloud-config.j2   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 c4056ffc4..38260fe7c 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
@@ -19,7 +19,7 @@ ca-file="{{ kube_config_dir }}/external-openstack-cacert.pem"
 {% endif %}
 
 [LoadBalancer]
-use-octavia={{ external_openstack_lbaas_use_octavia }}
+use-octavia={{ external_openstack_lbaas_use_octavia | string | lower }}
 create-monitor={{ external_openstack_lbaas_create_monitor }}
 monitor-delay={{ external_openstack_lbaas_monitor_delay }}
 monitor-timeout={{ external_openstack_lbaas_monitor_timeout }}
@@ -45,3 +45,6 @@ manage-security-groups={{ external_openstack_lbaas_manage_security_groups }}
 {% if external_openstack_lbaas_internal_lb is defined %}
 internal-lb={{ external_openstack_lbaas_internal_lb }}
 {% endif %}
+{% if external_openstack_lbaas_use_octavia is defined and external_openstack_lbaas_use_octavia %}
+lb-provider=octavia
+{% endif %}
-- 
GitLab