openstack/kolla-ansible
Code Issues Proposed changes

Merge "Access glance through vip rather than multi glance ips in ironic"

Browse Source
This commit is contained in:
Jenkins 2017-03-16 08:28:16 +00:00 committed by Gerrit Code Review
commit cf6e954c43
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/ironic/templates/ironic.conf.j2
View File

@ -60,7 +60,7 @@ memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansi
[glance] [glance]
glance_host = {% 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_host = {{ internal_protocol }}://{% if orchestration_engine == 'KUBERNETES' %}glance-api{% else %}{{ kolla_internal_fqdn }}{% endif %}:{{ glance_api_port }}
[neutron] [neutron]
{% if orchestration_engine == 'KUBERNETES' %} {% if orchestration_engine == 'KUBERNETES' %}

1
ansible/roles/nova/templates/nova.conf.j2
View File

@ -34,6 +34,7 @@ scheduler_host_manager = ironic_host_manager
{% if service_name == "nova-compute-ironic" %} {% if service_name == "nova-compute-ironic" %}
host={{ ansible_hostname }}-ironic host={{ ansible_hostname }}-ironic
log_file = /var/log/kolla/nova/nova-compute-ironic.log
compute_driver = ironic.IronicDriver compute_driver = ironic.IronicDriver
vnc_enabled = False vnc_enabled = False
ram_allocation_ratio = 1.0 ram_allocation_ratio = 1.0