openstack/kolla-ansible
Code Issues Proposed changes

Merge "Make it possible to not haproxy memcached"

Browse Source
This commit is contained in:
Zuul 2018-04-03 01:33:25 +00:00 committed by Gerrit Code Review
commit b32f224db5
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ansible/group_vars/all.yml
View File

@ -376,6 +376,12 @@ enable_nova: "yes"
enable_rabbitmq: "{{ 'yes' if om_rpc_transport == 'rabbit' or om_notify_transport == 'rabbit' else 'no' }}" enable_rabbitmq: "{{ 'yes' if om_rpc_transport == 'rabbit' or om_notify_transport == 'rabbit' else 'no' }}"
enable_outward_rabbitmq: "{{ enable_murano | bool }}" enable_outward_rabbitmq: "{{ enable_murano | bool }}"
# Most memcache clients handle load-balancing via client side
# hashing (consistent or not) logic, so going under the covers and messing
# with things that the clients are not aware of is general wrong (but this
# keeps the default as is...)
enable_haproxy_memcached: "yes"
# Additional optional OpenStack features and services are specified here # Additional optional OpenStack features and services are specified here
enable_aodh: "no" enable_aodh: "no"
enable_barbican: "no" enable_barbican: "no"

2
ansible/roles/haproxy/templates/haproxy.cfg.j2
View File

@ -922,7 +922,7 @@ listen mariadb
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% if enable_memcached | bool %} {% if enable_memcached | bool and enable_haproxy_memcached | bool %}
listen memcached listen memcached
mode tcp mode tcp
timeout client 3600s timeout client 3600s