From 77170a8547cf9e3c230b7c807bd9d53cc36ff2b9 Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Mon, 1 Jul 2019 19:51:28 +0100
Subject: [PATCH] Support customising refactored HAProxy config
Change-Id: I435ab9f88f73a73d7dc02f604f05e6f6def02eb5
---
ansible/roles/kolla-openstack/vars/main.yml | 4 ++++
doc/source/configuration/kolla-ansible.rst | 3 ++-
.../add-support-for-haproxy-config-b7b8f331e8adb2e0.yaml | 6 ++++++
3 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 releasenotes/notes/add-support-for-haproxy-config-b7b8f331e8adb2e0.yaml
diff --git a/ansible/roles/kolla-openstack/vars/main.yml b/ansible/roles/kolla-openstack/vars/main.yml
index b6d1214f..d11639ce 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 b2adc720..8d16b373 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 00000000..3aaa081e
--- /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/``.
--
GitLab