From d038f7f75060c742f648afca96fe7a920a7af93e Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Date: Sat, 11 Mar 2017 13:16:04 +0800
Subject: [PATCH] Access glance through vip rather than multi glance ips in
ironic
* Ironic do not support multi glance ips.
* Write the nova-compute-ironic binary log to nova-compute-ironic.log
file
Change-Id: I87359c47a5845c4d7a6ab9daaefcc94a51c92eb0
Closes-Bug: #1671989
---
ansible/roles/ironic/templates/ironic.conf.j2 | 2 +-
ansible/roles/nova/templates/nova.conf.j2 | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/ansible/roles/ironic/templates/ironic.conf.j2 b/ansible/roles/ironic/templates/ironic.conf.j2
index 30505e2a74..80ec5f81ec 100644
--- a/ansible/roles/ironic/templates/ironic.conf.j2
+++ b/ansible/roles/ironic/templates/ironic.conf.j2
@@ -60,7 +60,7 @@ memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansi
[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]
{% if orchestration_engine == 'KUBERNETES' %}
diff --git a/ansible/roles/nova/templates/nova.conf.j2 b/ansible/roles/nova/templates/nova.conf.j2
index 9b4354297f..869ddc9c71 100644
--- a/ansible/roles/nova/templates/nova.conf.j2
+++ b/ansible/roles/nova/templates/nova.conf.j2
@@ -34,6 +34,7 @@ scheduler_host_manager = ironic_host_manager
{% if service_name == "nova-compute-ironic" %}
host={{ ansible_hostname }}-ironic
+log_file = /var/log/kolla/nova/nova-compute-ironic.log
compute_driver = ironic.IronicDriver
vnc_enabled = False
ram_allocation_ratio = 1.0