From 35fee342f09771610fa13d9856a6f15ce7c258bb Mon Sep 17 00:00:00 2001
From: Serguei Bezverkhi <sbezverk@cisco.com>
Date: Tue, 14 Feb 2017 16:48:50 -0500
Subject: [PATCH] Changing ironic-inspector configuration for kolla-kubernetes

Changing ironic-inspector configuration for kolla-kubernetes

Change-Id: Ib1ff99d2d58ca9f910b8e68e6076359e2e7ec5a0
Closes-Bug: #1664726
---
 .../ironic/templates/ironic-inspector.conf.j2 | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/ansible/roles/ironic/templates/ironic-inspector.conf.j2 b/ansible/roles/ironic/templates/ironic-inspector.conf.j2
index 86a8975315..14cdd9b1f3 100644
--- a/ansible/roles/ironic/templates/ironic-inspector.conf.j2
+++ b/ansible/roles/ironic/templates/ironic-inspector.conf.j2
@@ -2,11 +2,19 @@
 debug = {{ ironic_logging_debug }}
 log_dir = /var/log/kolla/ironic
 
+{% if orchestration_engine != 'KUBERNETES' %}
 listen_address = {{ api_interface_address }}
+{% else %}
+listen_address = 0.0.0.0
+{% endif %}
 listen_port = {{ ironic_inspector_port }}
 
 [ironic]
+{% if orchestration_engine == 'KUBERNETES' %}
+auth_url = {{ keystone_admin_url }}
+{% else %}
 auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}
+{% endif %}
 auth_type = password
 project_domain_id = default
 user_domain_id = default
@@ -15,8 +23,13 @@ username = {{ ironic_inspector_keystone_user }}
 password = {{ ironic_inspector_keystone_password }}
 
 [keystone_authtoken]
+{% if orchestration_engine == 'KUBERNETES' %}
+auth_uri = {{ keystone_internal_url }}
+auth_url = {{ keystone_admin_url }}
+{% else %}
 auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}
 auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}
+{% endif %}
 auth_type = password
 project_domain_id = default
 user_domain_id = default
@@ -26,10 +39,18 @@ password = {{ ironic_inspector_keystone_password }}
 
 memcache_security_strategy = ENCRYPT
 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 %}
+{%- endif %}
 
 [firewall]
+{% if orchestration_engine == 'KUBERNETES' %}
+dnsmasq_interface = undefined
+{% else %}
 dnsmasq_interface = {{ ironic_dnsmasq_interface }}
+{%- endif %}
 
 [database]
 connection = mysql+pymysql://{{ ironic_inspector_database_user }}:{{ ironic_inspector_database_password }}@{{ ironic_inspector_database_address }}/{{ ironic_inspector_database_name }}