diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-12 15:45:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-12 15:45:35 +0000 |
| commit | a4cd16eb608a48bba5832115692ba419657c3e80 (patch) | |
| tree | 9768132e1093805d226d180dfb7d21d52927bac1 | |
| parent | aa38185331217f8344afc99f4a7ebdf9a557df94 (diff) | |
| parent | 37b3c8c35454a1076b3fbe32502264be71fd6e0d (diff) | |
| download | kolla-a4cd16eb608a48bba5832115692ba419657c3e80.tar.gz kolla-a4cd16eb608a48bba5832115692ba419657c3e80.zip | |
Merge "Keystone interface address and memcached override"
| -rw-r--r-- | ansible/roles/keystone/templates/keystone.conf.j2 | 10 | ||||
| -rw-r--r-- | ansible/roles/keystone/templates/wsgi-keystone.conf.j2 | 4 |
2 files changed, 12 insertions, 2 deletions
diff --git a/ansible/roles/keystone/templates/keystone.conf.j2 b/ansible/roles/keystone/templates/keystone.conf.j2 index f5c9054de..6e8bbf450 100644 --- a/ansible/roles/keystone/templates/keystone.conf.j2 +++ b/ansible/roles/keystone/templates/keystone.conf.j2 @@ -19,4 +19,14 @@ domain_config_dir = /etc/keystone/domains [cache] backend = oslo_cache.memcache_pool enabled = True + +{# For Kolla-Ansible, generate the memcache servers based on the list of +memcached servers in the inventory and memcached_servers should be un-set. +For Kolla-Kubernetes, it is necessary to define the memcached_servers +variable in globals.yml to set it to the Kubernetes service for memcached. #} + +{% if orchestration_engine == 'KUBERNETES' %} +memcache_servers = {{ memcached_servers }} +{% else %} memcache_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %} +{%- endif %} diff --git a/ansible/roles/keystone/templates/wsgi-keystone.conf.j2 b/ansible/roles/keystone/templates/wsgi-keystone.conf.j2 index 6389c7330..e1bb125dc 100644 --- a/ansible/roles/keystone/templates/wsgi-keystone.conf.j2 +++ b/ansible/roles/keystone/templates/wsgi-keystone.conf.j2 @@ -1,7 +1,7 @@ {% set keystone_log_dir = '/var/log/kolla/keystone' %} {% set python_path = '/usr/lib/python2.7/site-packages' if kolla_install_type == 'binary' else '/var/lib/kolla/venv/lib/python2.7/site-packages' %} -Listen {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}:{{ keystone_public_port }} -Listen {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}:{{ keystone_admin_port }} +Listen {{ api_interface_address }}:{{ keystone_public_port }} +Listen {{ api_interface_address }}:{{ keystone_admin_port }} <VirtualHost *:{{ keystone_public_port }}> WSGIDaemonProcess keystone-public processes=5 threads=1 user=keystone group=keystone display-name=%{GROUP} python-path={{ python_path }} |