openstack/kayobe
Code Issues Proposed changes

Merge "Support custom HAProxy config"

Browse Source
This commit is contained in:
Zuul 2019-02-08 17:31:06 +00:00 committed by Gerrit Code Review
commit 99ddd5c41b
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ansible/roles/kolla-openstack/defaults/main.yml
View File

@ -60,6 +60,12 @@ grafana_local_admin_user_name:
# Free form extra configuration to append to grafana.ini. # Free form extra configuration to append to grafana.ini.
kolla_extra_grafana: kolla_extra_grafana:
###############################################################################
# HAProxy configuration.
# Whether to enable HAProxy.
kolla_enable_haproxy:
############################################################################### ###############################################################################
# Heat configuration. # Heat configuration.

1
ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml
View File

@ -34,6 +34,7 @@ provisioner:
kolla_extra_grafana: | kolla_extra_grafana: |
[extra-grafana.ini] [extra-grafana.ini]
foo=bar foo=bar
kolla_enable_haproxy: true
kolla_enable_heat: true kolla_enable_heat: true
kolla_extra_heat: | kolla_extra_heat: |
[extra-heat.conf] [extra-heat.conf]

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

@ -54,6 +54,11 @@ kolla_openstack_custom_config:
dest: "{{ kolla_node_custom_config_path }}/grafana" dest: "{{ kolla_node_custom_config_path }}/grafana"
patterns: "*" patterns: "*"
enabled: "{{ kolla_enable_grafana }}" enabled: "{{ kolla_enable_grafana }}"
# HAProxy.
- src: "{{ kolla_extra_config_path }}/haproxy"
dest: "{{ kolla_node_custom_config_path }}/haproxy"
patterns: "*"
enabled: "{{ kolla_enable_haproxy }}"
# Heat. # Heat.
- src: "{{ kolla_extra_config_path }}/heat" - src: "{{ kolla_extra_config_path }}/heat"
dest: "{{ kolla_node_custom_config_path }}/heat" dest: "{{ kolla_node_custom_config_path }}/heat"