From 3da0531906225d9e001553d85dfd5388d0fc68e9 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Fri, 6 Sep 2019 16:45:24 +0100
Subject: [PATCH] Fix removed and deprecated options in ironic.conf

The ironic configuration in ironic.conf uses several options which have
been removed in the Train cycle:

[glance] glance_api_servers was removed in https://review.opendev.org/#/c/665929.
[neutron] url was removed in https://review.opendev.org/#/c/672971.

We should use the endpoint catalog instead of specifying the endpoint
for both of these, and also ironic inspector. region_name and
valid_interfaces have been added for that purpose.

Other options are deprecated.

[conductor] api_url: Use [service_catalog] section to lookup ironic API
endpoint instead.

[inspector] enabled: No longer used.

Change-Id: If07c4ff9bfea7d780aeff5c3295a0ace7d10ecdc
Closes-Bug: #1843067
---
 ansible/roles/ironic/templates/ironic.conf.j2 | 34 +++++++++++++++----
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/ansible/roles/ironic/templates/ironic.conf.j2 b/ansible/roles/ironic/templates/ironic.conf.j2
index ca2fcc428f..30f5d52980 100644
--- a/ansible/roles/ironic/templates/ironic.conf.j2
+++ b/ansible/roles/ironic/templates/ironic.conf.j2
@@ -44,7 +44,6 @@ api_workers = {{ openstack_service_workers }}
 
 {% if service_name == 'ironic-conductor' %}
 [conductor]
-api_url = {{ internal_protocol }}://{{ ironic_internal_fqdn }}:{{ ironic_api_port }}
 automated_clean=false
 {% endif %}
 
@@ -62,6 +61,8 @@ user_domain_id = {{ default_user_domain_id }}
 project_name = service
 username = {{ ironic_keystone_user }}
 password = {{ ironic_keystone_password }}
+region_name = {{ openstack_region_name }}
+valid_interfaces = internal
 
 memcache_security_strategy = ENCRYPT
 memcache_secret_key = {{ memcache_secret_key }}
@@ -77,11 +78,12 @@ user_domain_id = default
 project_name = service
 username = {{ ironic_keystone_user }}
 password = {{ ironic_keystone_password }}
+region_name = {{ openstack_region_name }}
+valid_interfaces = internal
 {% endif %}
 
 {% if enable_glance | bool %}
 [glance]
-glance_api_servers = {{ internal_protocol }}://{{ glance_internal_fqdn }}:{{ glance_api_port }}
 auth_url = {{ keystone_admin_url }}
 auth_type = password
 project_domain_id = default
@@ -89,11 +91,12 @@ user_domain_id = default
 project_name = service
 username = {{ ironic_keystone_user }}
 password = {{ ironic_keystone_password }}
+region_name = {{ openstack_region_name }}
+valid_interfaces = internal
 {% endif %}
 
 {% if enable_neutron | bool %}
 [neutron]
-url = {{ internal_protocol }}://{{ neutron_internal_fqdn }}:{{ neutron_server_port }}
 auth_url = {{ keystone_admin_url }}
 auth_type = password
 project_domain_id = default
@@ -101,11 +104,12 @@ user_domain_id = default
 project_name = service
 username = {{ ironic_keystone_user }}
 password = {{ ironic_keystone_password }}
+region_name = {{ openstack_region_name }}
+valid_interfaces = internal
 cleaning_network = {{ ironic_cleaning_network }}
 {% endif %}
 
 [inspector]
-enabled = true
 {% if enable_keystone | bool %}
 auth_url = {{ keystone_admin_url }}
 auth_type = password
@@ -114,10 +118,28 @@ user_domain_id = default
 project_name = service
 username = {{ ironic_keystone_user }}
 password = {{ ironic_keystone_password }}
+region_name = {{ openstack_region_name }}
+valid_interfaces = internal
 {% else %}
-auth_type=none
-{% endif %}
+auth_type = none
 endpoint_override = {{ ironic_inspector_internal_endpoint }}
+{% endif %}
+
+[service_catalog]
+{% if enable_keystone | bool %}
+auth_url = {{ keystone_admin_url }}
+auth_type = password
+project_domain_id = default
+user_domain_id = default
+project_name = service
+username = {{ ironic_keystone_user }}
+password = {{ ironic_keystone_password }}
+region_name = {{ openstack_region_name }}
+valid_interfaces = internal
+{% else %}
+auth_type = none
+endpoint_override = {{ internal_protocol }}://{{ ironic_internal_fqdn }}:{{ ironic_api_port }}
+{% endif %}
 
 [agent]
 deploy_logs_local_path = /var/log/kolla/ironic