From 9a914123e9b530bb179cd541b7aa27c611b153ed Mon Sep 17 00:00:00 2001
From: Dmitry Tantsur <dtantsur@protonmail.com>
Date: Tue, 5 Nov 2019 13:06:44 +0100
Subject: [PATCH] Update bifrost for using managed boot

* Wire in inspector_extra_kernel_options for managed boot
* Set callback_endpoint_override for keystone-based installations
  to get the correct callback endpoint even if the catalog uses
  localhost for ironic-inspector.
* Delete no longer existing [inspector]enabled.

Story: #1528920
Task: #37364
Depends-On: https://review.opendev.org/688720
Change-Id: I5c1e207b79505e2d7274197edcb12d373c3315e1
---
 .../roles/bifrost-ironic-install/templates/ironic.conf.j2  | 3 ++-
 .../notes/managed-inspection-options-2764b4ae0079f505.yaml | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/managed-inspection-options-2764b4ae0079f505.yaml

diff --git a/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2 b/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2
index c00b65a7d..2b43c8a90 100644
--- a/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2
+++ b/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2
@@ -84,7 +84,7 @@ use_web_server_for_images = true
 
 {% if enable_inspector | bool == true %}
 [inspector]
-enabled = true
+extra_kernel_params = {{ inspector_extra_kernel_options | default('') }}
 {% if enable_keystone is defined and enable_keystone | bool == true %}
 auth_type = password
 auth_url = {{ ironic.service_catalog.auth_url }}
@@ -94,6 +94,7 @@ user_domain_id = default
 project_name = {{ ironic.service_catalog.project_name }}
 project_domain_id = default
 region_name = {{ keystone.bootstrap.region_name | default('RegionOne')}}
+callback_endpoint_override = http://{{ hostvars[inventory_hostname]['ansible_' + ans_network_interface]['ipv4']['address'] }}:5050
 {% else %}
 auth_type=none
 endpoint_override = http://{{ hostvars[inventory_hostname]['ansible_' + ans_network_interface]['ipv4']['address'] }}:5050
diff --git a/releasenotes/notes/managed-inspection-options-2764b4ae0079f505.yaml b/releasenotes/notes/managed-inspection-options-2764b4ae0079f505.yaml
new file mode 100644
index 000000000..977abf65c
--- /dev/null
+++ b/releasenotes/notes/managed-inspection-options-2764b4ae0079f505.yaml
@@ -0,0 +1,7 @@
+---
+upgrade:
+  - |
+    Due to the limitations of managed in-band inspection, the
+    ``inspector_extra_kernel_options`` parameter must only contain
+    ``key=value`` pairs. Use ``extra_kernel_options`` to provide generic
+    kernel options.