openstack/kolla-ansible
Code Issues Proposed changes

Merge "Use kolla_internal_vip_address for glance_api servers"

Browse Source
This commit is contained in:
Jenkins 2017-03-20 13:06:46 +00:00 committed by Gerrit Code Review
commit a6da4d98a4
2 changed files with 2 additions and 2 deletions
ansible/roles
cinder/templates
cinder.conf.j2
nova/templates
nova.conf.j2

2
ansible/roles/cinder/templates/cinder.conf.j2

@ -11,7 +11,7 @@ use_stderr = False
osapi_volume_workers = {{ openstack_service_workers }}
volume_name_template = volume-%s
glance_api_servers = {% for host in groups['glance-api'] %}{{ internal_protocol }}://{% if orchestration_engine == 'KUBERNETES' %}glance-api{% else %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}{% endif %}:{{ glance_api_port }}{% if not loop.last %},{% endif %}{% endfor %}
glance_api_servers = {{ internal_protocol }}://{% if orchestration_engine == 'KUBERNETES' %}glance-api{% else %}{{ kolla_internal_vip_address }}{% endif %}:{{ glance_api_port }}
glance_num_retries = {{ groups['glance-api'] | length }}
glance_api_version = 2

2
ansible/roles/nova/templates/nova.conf.j2

@ -127,7 +127,7 @@ api_endpoint = {{ internal_protocol }}://ironic-api:{{ ironic_api_port }}/v1
lock_path = /var/lib/nova/tmp
[glance]
api_servers = {% for host in groups['glance-api'] %}{{ internal_protocol }}://{% if orchestration_engine == 'KUBERNETES' %}glance-api{% else %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}{% endif %}:{{ glance_api_port }}{% if not loop.last %},{% endif %}{% endfor %}
api_servers = {{ internal_protocol }}://{% if orchestration_engine == 'KUBERNETES' %}glance-api{% else %}{{ kolla_internal_vip_address }}{% endif %}:{{ glance_api_port }}
num_retries = {{ groups['glance-api'] | length }}