Support customising refactored HAProxy config

Change-Id: I435ab9f88f73a73d7dc02f604f05e6f6def02eb5

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"

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.

releasenotes/notes/add-support-for-haproxy-config-b7b8f331e8adb2e0.yaml

+---
+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/``.