Merge "Remove unnecessary memcache variables" into stable/pike

This commit is contained in:
Zuul 2018-02-14 17:07:40 +00:00 committed by Gerrit Code Review
commit 2092ef59e1
2 changed files with 1 additions and 3 deletions

View File

@ -49,7 +49,7 @@
- name: os_keystone
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_keystone
version: a9118824b86155c3d890b94749cac81e3affdbfc
version: e87e2bd737467d4d1c1225f52cb7fad5a4d2cd5d
- name: openstack_openrc
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc

View File

@ -23,8 +23,6 @@ keystone_system_user_name: keystone
keystone_external_ssl: "{{ openstack_external_ssl }}"
keystone_cache_backend_argument: "url:{% for host in groups['memcached'] %}{{ hostvars[host]['container_address'] }}{% if not loop.last %},{% endif %}{% endfor %}:{{ memcached_port }}"
keystone_memcached_servers: "{% for host in groups['keystone_all'] %}{{ hostvars[host]['container_address'] }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %}"
keystone_service_in_ldap: "{{ service_ldap_backend_enabled }}"
# Ensure that the package state matches the global setting