openstack/kolla-ansible
Code Issues Proposed changes

Merge "Glance interface address, memcached override, and glance override."

Browse Source
This commit is contained in:
Jenkins 2016-08-03 13:59:11 +00:00 committed by Gerrit Code Review
commit ec4e8092d9
3 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ansible/roles/glance/templates/glance-api.conf.j2
View File

@ -5,11 +5,15 @@ debug = {{ glance_logging_debug }}
log_file = /var/log/kolla/glance/api.log log_file = /var/log/kolla/glance/api.log
use_forwarded_for = true use_forwarded_for = true
bind_host = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} bind_host = {{ api_interface_address }}
bind_port = {{ glance_api_port }} bind_port = {{ glance_api_port }}
workers = {{ openstack_service_workers }} workers = {{ openstack_service_workers }}
{% if orchestration_engine == 'KUBERNETES' %}
registry_host = {{ glance_registry_host }}
{% else %}
registry_host = {{ kolla_internal_fqdn }} registry_host = {{ kolla_internal_fqdn }}
{% endif %}
{% if enable_ceph | bool %} {% if enable_ceph | bool %}
show_image_direct_url= True show_image_direct_url= True
@ -23,8 +27,8 @@ connection = mysql+pymysql://{{ glance_database_user }}:{{ glance_database_passw
max_retries = -1 max_retries = -1
[keystone_authtoken] [keystone_authtoken]
auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }} auth_uri = {{ keystone_public_url }}
auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }} auth_url = {{ keystone_admin_url }}
auth_type = password auth_type = password
project_domain_id = default project_domain_id = default
user_domain_id = default user_domain_id = default
@ -32,10 +36,17 @@ project_name = service
username = {{ glance_keystone_user }} username = {{ glance_keystone_user }}
password = {{ glance_keystone_password }} password = {{ glance_keystone_password }}
{# 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. #}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} memcache_secret_key = {{ memcache_secret_key }}
{% if orchestration_engine == 'KUBERNETES' %}
memcache_servers = {{ memcached_servers }}
{% else %}
memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %} memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %}
{%- endif %}
[paste_deploy] [paste_deploy]
flavor = keystone flavor = keystone

15
ansible/roles/glance/templates/glance-registry.conf.j2
View File

@ -4,7 +4,7 @@ debug = {{ glance_logging_debug }}
# NOTE(elemoine) log_dir alone does not work for Glance # NOTE(elemoine) log_dir alone does not work for Glance
log_file = /var/log/kolla/glance/registry.log log_file = /var/log/kolla/glance/registry.log
bind_host = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} bind_host = {{ api_interface_address }}
bind_port = {{ glance_registry_port }} bind_port = {{ glance_registry_port }}
workers = {{ openstack_service_workers }} workers = {{ openstack_service_workers }}
@ -13,8 +13,8 @@ connection = mysql+pymysql://{{ glance_database_user }}:{{ glance_database_passw
max_retries = -1 max_retries = -1
[keystone_authtoken] [keystone_authtoken]
auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }} auth_uri = {{ keystone_public_url }}
auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }} auth_url = {{ keystone_admin_url }}
auth_type = password auth_type = password
project_domain_id = default project_domain_id = default
user_domain_id = default user_domain_id = default
@ -22,10 +22,17 @@ project_name = service
username = {{ glance_keystone_user }} username = {{ glance_keystone_user }}
password = {{ glance_keystone_password }} password = {{ glance_keystone_password }}
{# 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. #}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} memcache_secret_key = {{ memcache_secret_key }}
{% if orchestration_engine == 'KUBERNETES' %}
memcache_servers = {{ memcached_servers }}
{% else %}
memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %} memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %}
{%- endif %}
[paste_deploy] [paste_deploy]
flavor = keystone flavor = keystone