Merge "Make it possible to not haproxy memcached"
This commit is contained in:
commit
b32f224db5
@ -376,6 +376,12 @@ enable_nova: "yes"
|
||||
enable_rabbitmq: "{{ 'yes' if om_rpc_transport == 'rabbit' or om_notify_transport == 'rabbit' else 'no' }}"
|
||||
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
|
||||
enable_aodh: "no"
|
||||
enable_barbican: "no"
|
||||
|
@ -922,7 +922,7 @@ listen mariadb
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
|
||||
{% if enable_memcached | bool %}
|
||||
{% if enable_memcached | bool and enable_haproxy_memcached | bool %}
|
||||
listen memcached
|
||||
mode tcp
|
||||
timeout client 3600s
|
||||
|
Loading…
Reference in New Issue
Block a user