openstack/bifrost
Code Issues Proposed changes

Wire in node auto-discovery

Browse Source 
Change-Id: I99ff327e4b8385f8e4ca220331117ab7d5a10418
Depends-On: https://review.opendev.org/c/openstack/ironic/+/906376
This commit is contained in:
Dmitry Tantsur 2024-01-25 12:42:21 +01:00
parent 6065da92b1
commit e8f365e0eb
No known key found for this signature in database
GPG Key ID: 315B2AF9FD216C60
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
playbooks/roles/bifrost-ironic-install/defaults/main.yml
View File

@ -261,12 +261,6 @@ enable_inspector_discovery: false
inspector_default_node_driver: "{{ 'manual-management' if enable_credential_less_deploy | bool else 'ipmi' }}" inspector_default_node_driver: "{{ 'manual-management' if enable_credential_less_deploy | bool else 'ipmi' }}"
# Inspector defaults (deprecated in Victoria)
inspector:
discovery:
enabled: "{{ enable_inspector_discovery }}"
default_node_driver: "{{ inspector_default_node_driver }}"
# If baremetal nodes should be turned off after inspection. # If baremetal nodes should be turned off after inspection.
# The inspector default is to turn off the baremetal node # The inspector default is to turn off the baremetal node
# power, this setting to false enables use of fast track mode. # power, this setting to false enables use of fast track mode.

4
playbooks/roles/bifrost-ironic-install/templates/ironic-inspector.conf.j2
View File

@ -88,9 +88,9 @@ processing_hooks = {{ inspector_processing_hooks }}
store_data = database store_data = database
power_off = {{ power_off_after_inspection }} power_off = {{ power_off_after_inspection }}
{% if inspector.discovery.enabled | bool %} {% if enable_inspector_discovery | bool %}
node_not_found_hook = enroll node_not_found_hook = enroll
[discovery] [discovery]
enroll_node_driver = {{ inspector.discovery.default_node_driver }} enroll_node_driver = {{ inspector_default_node_driver }}
{% endif %} {% endif %}

4
playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2
View File

@ -182,6 +182,10 @@ cafile = {{ tls_certificate_path }}
{% endif %} {% endif %}
{% endif %} {% endif %}
[auto_discovery]
enabled = {{ enable_inspector_discovery | bool }}
driver = {{ inspector_default_node_driver }}
{% if enable_keystone is defined and enable_keystone | bool == true %} {% if enable_keystone is defined and enable_keystone | bool == true %}
[keystone_authtoken] [keystone_authtoken]
auth_plugin = password auth_plugin = password