diff --git a/ansible/roles/kolla-openstack/vars/main.yml b/ansible/roles/kolla-openstack/vars/main.yml index b6d1214f095926035aa4652a57d610272468e1c9..d11639ce76e992d79cedc78cdead6ccd5ce7625d 100644 --- a/ansible/roles/kolla-openstack/vars/main.yml +++ b/ansible/roles/kolla-openstack/vars/main.yml @@ -64,6 +64,10 @@ kolla_openstack_custom_config: dest: "{{ kolla_node_custom_config_path }}/haproxy" patterns: "*" enabled: "{{ kolla_enable_haproxy }}" + - src: "{{ kolla_extra_config_path }}/haproxy-config" + dest: "{{ kolla_node_custom_config_path }}/haproxy-config" + patterns: "*" + enabled: "{{ kolla_enable_haproxy }}" # Heat. - src: "{{ kolla_extra_config_path }}/heat" dest: "{{ kolla_node_custom_config_path }}/heat" diff --git a/doc/source/configuration/kolla-ansible.rst b/doc/source/configuration/kolla-ansible.rst index b2adc7201cc888b060bf690f4cc88a61bd06cedb..8d16b37380c5475099801721507a4df90734839d 100644 --- a/doc/source/configuration/kolla-ansible.rst +++ b/doc/source/configuration/kolla-ansible.rst @@ -165,7 +165,8 @@ which files are supported. ``glance.conf`` Glance configuration. ``glance/*`` Extended Glance configuration. ``grafana/*`` Extended Grafana configuration. - ``haproxy/*`` HAProxy configuration. + ``haproxy/*`` Main HAProxy configuration. + ``haproxy-config/*`` Modular HAProxy configuration. ``heat.conf`` Heat configuration. ``heat/*`` Extended heat configuration. ``horizon/*`` Extended horizon configuration. diff --git a/releasenotes/notes/add-support-for-haproxy-config-b7b8f331e8adb2e0.yaml b/releasenotes/notes/add-support-for-haproxy-config-b7b8f331e8adb2e0.yaml new file mode 100644 index 0000000000000000000000000000000000000000..3aaa081ea813d01ca095cb09388f4d6e77388a17 --- /dev/null +++ b/releasenotes/notes/add-support-for-haproxy-config-b7b8f331e8adb2e0.yaml @@ -0,0 +1,6 @@ +--- +features: + - | + Adds support for customising the refactored HAProxy configuration + introduced in Kolla Ansible in the Stein release, using + ``$KAYOBE_CONFIG_PATH/kolla/config/haproxy-config/``.