openstack/kayobe
Code Issues Proposed changes

Merge "Support customising refactored HAProxy config"

Browse Source
This commit is contained in:
Zuul 2019-07-08 16:17:11 +00:00 committed by Gerrit Code Review
commit 2002cf6019
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/kolla-openstack/vars/main.yml
View File

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

3
doc/source/configuration/kolla-ansible.rst
View File

@ -167,7 +167,8 @@ which files are supported.
``gnocchi.conf`` Gnocchi configuration.
``gnocchi/*`` Extended Gnocchi 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.

6
releasenotes/notes/add-support-for-haproxy-config-b7b8f331e8adb2e0.yaml Normal file
View File

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