Merge "Test haproxy single external frontend"

This commit is contained in:
Zuul 2024-01-12 21:06:10 +00:00 committed by Gerrit Code Review
commit 3490b0f14e
6 changed files with 56 additions and 0 deletions

View File

@ -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:

View File

@ -222,6 +222,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"

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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