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
This commit is contained in:
Dmitry Tantsur 2019-11-05 13:06:44 +01:00
parent 4dbaa6c28c
commit 9a914123e9
2 changed files with 9 additions and 1 deletions

View File

@ -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

View File

@ -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.