From 1dd38721b3a5a8e9906d77d7ccf884a48ad9e81c Mon Sep 17 00:00:00 2001
From: Cedric Hnyda <cedric.hnyda@itera.io>
Date: Tue, 4 May 2021 09:33:11 +0200
Subject: [PATCH] Add external_openstack_enable_ingress_hostname option for
openstack (#7572)
Signed-off-by: Cedric Hnyda <cedric.hnyda@itera.io>
---
.../openstack/templates/external-openstack-cloud-config.j2 | 3 +++
roles/kubespray-defaults/defaults/main.yaml | 1 +
2 files changed, 4 insertions(+)
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 ba631e5da..ab8d5f39b 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
@@ -62,6 +62,9 @@ use-octavia={{ external_openstack_lbaas_use_octavia }}
lb-provider=octavia
use-octavia=true
{% endif %}
+{% if external_openstack_enable_ingress_hostname is defined %}
+enable-ingress-hostname={{ external_openstack_enable_ingress_hostname | bool }}
+{% endif %}
[Networking]
ipv6-support-disabled={{ external_openstack_network_ipv6_disabled | string | lower }}
diff --git a/roles/kubespray-defaults/defaults/main.yaml b/roles/kubespray-defaults/defaults/main.yaml
index 1546833f5..56c5b95dd 100644
--- a/roles/kubespray-defaults/defaults/main.yaml
+++ b/roles/kubespray-defaults/defaults/main.yaml
@@ -392,6 +392,7 @@ openstack_lbaas_monitor_max_retries: "3"
openstack_cacert: "{{ lookup('env','OS_CACERT') }}"
# Default values for the external OpenStack Cloud Controller
+external_openstack_enable_ingress_hostname: false
external_openstack_lbaas_create_monitor: false
external_openstack_lbaas_monitor_delay: "1m"
external_openstack_lbaas_monitor_timeout: "30s"
--
GitLab