From d935f55f7c7a5044946b919957c452f88bf287f0 Mon Sep 17 00:00:00 2001
From: Doug Szumski <doug@stackhpc.com>
Date: Fri, 1 Feb 2019 13:10:22 +0000
Subject: [PATCH] Support custom HAProxy config
Note that in the Stein release of Kolla-Ansible haproxy.cfg was refactored and
this override will no longer work as expected.
Change-Id: Iff5b9f2a33ad2320f62fae7328c097069cb4f416
---
ansible/roles/kolla-openstack/defaults/main.yml | 6 ++++++
.../kolla-openstack/molecule/enable-everything/molecule.yml | 1 +
ansible/roles/kolla-openstack/vars/main.yml | 5 +++++
3 files changed, 12 insertions(+)
diff --git a/ansible/roles/kolla-openstack/defaults/main.yml b/ansible/roles/kolla-openstack/defaults/main.yml
index 9772001f..78273ac0 100644
--- a/ansible/roles/kolla-openstack/defaults/main.yml
+++ b/ansible/roles/kolla-openstack/defaults/main.yml
@@ -60,6 +60,12 @@ grafana_local_admin_user_name:
# Free form extra configuration to append to grafana.ini.
kolla_extra_grafana:
+###############################################################################
+# HAProxy configuration.
+
+# Whether to enable HAProxy.
+kolla_enable_haproxy:
+
###############################################################################
# Heat configuration.
diff --git a/ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml b/ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml
index c54c8540..e36cb7b3 100644
--- a/ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml
+++ b/ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml
@@ -34,6 +34,7 @@ provisioner:
kolla_extra_grafana: |
[extra-grafana.ini]
foo=bar
+ kolla_enable_haproxy: true
kolla_enable_heat: true
kolla_extra_heat: |
[extra-heat.conf]
diff --git a/ansible/roles/kolla-openstack/vars/main.yml b/ansible/roles/kolla-openstack/vars/main.yml
index 7801a5ea..457230c4 100644
--- a/ansible/roles/kolla-openstack/vars/main.yml
+++ b/ansible/roles/kolla-openstack/vars/main.yml
@@ -54,6 +54,11 @@ kolla_openstack_custom_config:
dest: "{{ kolla_node_custom_config_path }}/grafana"
patterns: "*"
enabled: "{{ kolla_enable_grafana }}"
+ # HAProxy.
+ - src: "{{ kolla_extra_config_path }}/haproxy"
+ dest: "{{ kolla_node_custom_config_path }}/haproxy"
+ patterns: "*"
+ enabled: "{{ kolla_enable_haproxy }}"
# Heat.
- src: "{{ kolla_extra_config_path }}/heat"
dest: "{{ kolla_node_custom_config_path }}/heat"
--
GitLab