Merge "Update bifrost for using managed boot"

This commit is contained in:
Zuul 2019-11-26 15:33:48 +00:00 committed by Gerrit Code Review
commit 15e7b0f89f
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.