Merge "Support custom HAProxy config"

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.
 

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]

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"