diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-04 14:24:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-04 14:24:11 +0000 |
| commit | fbedc6145d088d08950ee216f94550da5282b71c (patch) | |
| tree | d096127a578cfd70630a4efdd7a66c13a9352105 /ansible | |
| parent | 4f6b6fc808b3653013c35e11bf4013cce47becad (diff) | |
| parent | 2d446c462fe3065093d8c52df3a1f1ea2be3a08a (diff) | |
| download | kolla-fbedc6145d088d08950ee216f94550da5282b71c.tar.gz kolla-fbedc6145d088d08950ee216f94550da5282b71c.zip | |
Merge "Set memcache connection limit to 5000"
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/memcached/defaults/main.yml | 5 | ||||
| -rw-r--r-- | ansible/roles/memcached/templates/memcached.json.j2 | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ansible/roles/memcached/defaults/main.yml b/ansible/roles/memcached/defaults/main.yml index 9c219d4fb..8377b77d4 100644 --- a/ansible/roles/memcached/defaults/main.yml +++ b/ansible/roles/memcached/defaults/main.yml @@ -7,3 +7,8 @@ project_name: "memcached" memcached_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-memcached" memcached_tag: "{{ openstack_release }}" memcached_image_full: "{{ memcached_image }}:{{ memcached_tag }}" + +#################### +# Memcached options +#################### +memcached_connection_limit: "5000" diff --git a/ansible/roles/memcached/templates/memcached.json.j2 b/ansible/roles/memcached/templates/memcached.json.j2 index 2e471c0c8..dcad615a6 100644 --- a/ansible/roles/memcached/templates/memcached.json.j2 +++ b/ansible/roles/memcached/templates/memcached.json.j2 @@ -1,3 +1,4 @@ { - "command": "/usr/bin/memcached -vv -l {{ api_interface_address }} -p {{ memcached_port }}" + "command": "/usr/bin/memcached -vv -l {{ api_interface_address }} -p {{ memcached_port }} -c {{ memcached_connection_limit }}", + "config_files": [] } |