Merge "Fix ironic inspector public endpoint"

ansible/roles/ironic/defaults/main.yml

@@ -50,8 +50,8 @@ ironic_internal_endpoint: "{{ internal_protocol }}://{{ kolla_internal_fqdn }}:{
 ironic_public_endpoint: "{{ public_protocol }}://{{ kolla_external_fqdn }}:{{ ironic_api_port }}"
 
 ironic_inspector_admin_endpoint: "{{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ ironic_inspector_port }}"
-ironic_inspector_internal_endpoint: "{{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ ironic_inspector_port }}"
-ironic_inspector_public_endpoint: "{{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ ironic_inspector_port }}"
+ironic_inspector_internal_endpoint: "{{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ ironic_inspector_port }}"
+ironic_inspector_public_endpoint: "{{ public_protocol }}://{{ kolla_external_fqdn }}:{{ ironic_inspector_port }}"
 
 ironic_logging_debug: "{{ openstack_logging_debug }}"
 

ansible/roles/ironic/tasks/reconfigure.yml

@@ -1,4 +1,9 @@
 ---
+- include: register.yml
+  when: enable_keystone | bool and
+        (inventory_hostname in groups['ironic-api'] or
+        inventory_hostname in groups['ironic-inspector'])
+
 - name: Ensuring the containers up
   kolla_docker:
     name: "{{ item.name }}"

ansible/roles/ironic/tasks/upgrade.yml

@@ -1,4 +1,9 @@
 ---
+- include: register.yml
+  when: enable_keystone | bool and
+        (inventory_hostname in groups['ironic-api'] or
+        inventory_hostname in groups['ironic-inspector'])
+
 - include: config.yml
 
 - include: bootstrap_service.yml

ansible/roles/ironic/templates/ironic.conf.j2

@@ -83,6 +83,7 @@ user_domain_id = default
 project_name = service
 username = {{ ironic_keystone_user }}
 password = {{ ironic_keystone_password }}
+service_url = {{ ironic_inspector_internal_endpoint }}
 
 [agent]
 deploy_logs_local_path = /var/log/kolla/ironic

releasenotes/notes/inspector-public-endpoint-61e0adc37f882a64.yaml

@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixes a bug where the Baremetal Introspection service's public endpoint
+    registered in the Identity service referenced the internal API endpoint.