Merge "Wire in node auto-discovery"
This commit is contained in:
commit
cb0e69abe5
|
@ -261,12 +261,6 @@ enable_inspector_discovery: false
|
|||
|
||||
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.
|
||||
# The inspector default is to turn off the baremetal node
|
||||
# power, this setting to false enables use of fast track mode.
|
||||
|
|
|
@ -88,9 +88,9 @@ processing_hooks = {{ inspector_processing_hooks }}
|
|||
store_data = database
|
||||
power_off = {{ power_off_after_inspection }}
|
||||
|
||||
{% if inspector.discovery.enabled | bool %}
|
||||
{% if enable_inspector_discovery | bool %}
|
||||
node_not_found_hook = enroll
|
||||
|
||||
[discovery]
|
||||
enroll_node_driver = {{ inspector.discovery.default_node_driver }}
|
||||
enroll_node_driver = {{ inspector_default_node_driver }}
|
||||
{% endif %}
|
||||
|
|
|
@ -182,6 +182,10 @@ cafile = {{ tls_certificate_path }}
|
|||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
[auto_discovery]
|
||||
enabled = {{ enable_inspector_discovery | bool }}
|
||||
driver = {{ inspector_default_node_driver }}
|
||||
|
||||
{% if enable_keystone is defined and enable_keystone | bool == true %}
|
||||
[keystone_authtoken]
|
||||
auth_plugin = password
|
||||
|
|
Loading…
Reference in New Issue