From 9bc99b943406f41082e5f722f73beb3d88326e6b Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Tue, 10 May 2022 10:51:29 +0200
Subject: [PATCH] Test haproxy single external frontend

Change-Id: Id25b4407a8170f69e4cd7278e0aff64c609ace7d
---
 tests/pre.yml                      | 12 ++++++++++++
 tests/templates/globals-default.j2 | 12 ++++++++++++
 tests/test-core-openstack.sh       |  1 +
 zuul.d/base.yaml                   | 13 +++++++++++++
 zuul.d/jobs.yaml                   | 16 ++++++++++++++++
 zuul.d/project.yaml                |  2 ++
 6 files changed, 56 insertions(+)

diff --git a/tests/pre.yml b/tests/pre.yml
index 7df42d8465..984440b3dc 100644
--- a/tests/pre.yml
+++ b/tests/pre.yml
@@ -26,6 +26,18 @@
       vars:
         bridge_name: "{{ neutron_external_bridge_name }}"
         bridge_member_name: "{{ neutron_external_vxlan_interface_name }}"
+    - role: multi-node-vxlan-overlay
+      vars:
+        vxlan_interface_name: "{{ external_api_interface_name }}"
+        vxlan_vni: 10002
+      when: external_api_interface_name is defined
+    - role: multi-node-managed-addressing
+      vars:
+        managed_interface_name: "{{ external_api_interface_name }}"
+        managed_network_prefix: "{{ external_api_network_prefix }}"
+        managed_network_prefix_length: "{{ external_api_network_prefix_length }}"
+        managed_network_address_family: "{{ address_family }}"
+      when: external_api_interface_name is defined
     # TODO(mnasiadka): Update ipv6 jobs to test ipv6 in Neutron
     - role: multi-node-managed-addressing
       vars:
diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2
index 248e8f5a08..f99a32509e 100644
--- a/tests/templates/globals-default.j2
+++ b/tests/templates/globals-default.j2
@@ -215,6 +215,18 @@ neutron_modules_extra:
   - name: 'nf_conntrack_tftp'
   - name: 'nf_nat_tftp'
 
+{% if scenario == "haproxy" %}
+kolla_external_vip_address: "{{ kolla_external_vip_address }}"
+haproxy_single_external_frontend: "yes"
+glance_external_fqdn: "glance.external"
+horizon_external_fqdn: "horizon.external"
+keystone_external_fqdn: "keystone.external"
+neutron_external_fqdn: "neutron.external"
+nova_external_fqdn: "nova.external"
+nova_novncproxy_external_fqdn: "novncproxy.external"
+placement_external_fqdn: "placement.external"
+{% endif %}
+
 {% if scenario == "lets-encrypt" %}
 enable_letsencrypt: "yes"
 rabbitmq_enable_tls: "yes"
diff --git a/tests/test-core-openstack.sh b/tests/test-core-openstack.sh
index d00c1801e3..991314b503 100755
--- a/tests/test-core-openstack.sh
+++ b/tests/test-core-openstack.sh
@@ -8,6 +8,7 @@ set -o pipefail
 export PYTHONUNBUFFERED=1
 
 function test_smoke {
+    openstack --debug endpoint list
     openstack --debug compute service list
     openstack --debug network agent list
     openstack --debug orchestration service list
diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index df84860f3c..e7239fbaa0 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -276,6 +276,19 @@
       - ^tests/run-hashi-vault.yml
       - ^tests/test-hashicorp-vault-passwords.sh
 
+- job:
+    name: kolla-ansible-haproxy-base
+    parent: kolla-ansible-base
+    voting: false
+    files:
+      - ^ansible/roles/haproxy/
+    vars:
+      external_api_interface_name: vxlan2
+      external_api_network_prefix: "192.0.3."
+      external_api_network_prefix_length: "24"
+      kolla_external_vip_address: "192.0.3.10"
+      scenario: haproxy
+
 - job:
     name: kolla-ansible-lets-encrypt-base
     parent: kolla-ansible-base
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index ea5061f589..e655b904bd 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -472,6 +472,22 @@
     vars:
       base_distro: rocky
 
+- job:
+    name: kolla-ansible-rocky9-haproxy-fqdn
+    parent: kolla-ansible-haproxy-base
+    nodeset: kolla-ansible-rocky9
+    vars:
+      base_distro: rocky
+      tls_enabled: true
+
+- job:
+    name: kolla-ansible-ubuntu-haproxy-fqdn
+    parent: kolla-ansible-haproxy-base
+    nodeset: kolla-ansible-jammy
+    vars:
+      base_distro: ubuntu
+      tls_enabled: true
+
 - job:
     name: kolla-ansible-ubuntu-skyline
     parent: kolla-ansible-skyline-base
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 670b92c0a6..4ca549fd7f 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -60,6 +60,8 @@
         - kolla-ansible-rocky9-upgrade-cephadm
         - kolla-ansible-ubuntu-upgrade-cephadm
         - kolla-ansible-rocky9-hashi-vault
+        - kolla-ansible-rocky9-haproxy-fqdn
+        - kolla-ansible-ubuntu-haproxy-fqdn
         - kolla-ansible-ubuntu-lets-encrypt
         - kolla-ansible-rocky9-lets-encrypt
         - kolla-ansible-ubuntu-skyline