Merge "Add redfish_address variable and support discovering it"
This commit is contained in:
commit
4ba700080e
@ -13,3 +13,6 @@ ipmi_username:
|
|||||||
|
|
||||||
# Password to use to access a host's BMC via IPMI.
|
# Password to use to access a host's BMC via IPMI.
|
||||||
ipmi_password:
|
ipmi_password:
|
||||||
|
|
||||||
|
# Address to use to access a host's BMC via Redfish.
|
||||||
|
redfish_address:
|
||||||
|
@ -46,9 +46,10 @@
|
|||||||
and host not in ignore_hosts %}
|
and host not in ignore_hosts %}
|
||||||
{% set hostvars=ironic_inventory._meta.hostvars[host] %}
|
{% set hostvars=ironic_inventory._meta.hostvars[host] %}
|
||||||
{% set ipmi_address=hostvars.driver_info.ipmi_address | default %}
|
{% set ipmi_address=hostvars.driver_info.ipmi_address | default %}
|
||||||
|
{% set redfish_address=hostvars.driver_info.redfish_address | default %}
|
||||||
{% set system_vendor=hostvars.extra.system_vendor | default %}
|
{% set system_vendor=hostvars.extra.system_vendor | default %}
|
||||||
{% set bmc_type=system_vendor | bmc_type_from_system_vendor %}
|
{% set bmc_type=system_vendor | bmc_type_from_system_vendor %}
|
||||||
{{ host }} ipmi_address={{ ipmi_address }} bmc_type={{ bmc_type }}
|
{{ host }} {% if redfish_address %}redfish_address={{ redfish_address }} {% elif ipmi_address %}ipmi_address={{ ipmi_address }} {% endif %}bmc_type={{ bmc_type }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|
||||||
|
@ -14,6 +14,9 @@
|
|||||||
# Password to use to access a host's BMC via IPMI.
|
# Password to use to access a host's BMC via IPMI.
|
||||||
#ipmi_password:
|
#ipmi_password:
|
||||||
|
|
||||||
|
# Address to use to access a host's BMC via Redfish.
|
||||||
|
#redfish_address:
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
# Dummy variable to allow Ansible to accept this file.
|
# Dummy variable to allow Ansible to accept this file.
|
||||||
workaround_ansible_issue_8743: yes
|
workaround_ansible_issue_8743: yes
|
||||||
|
@ -0,0 +1,6 @@
|
|||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
Adds a new ``redfish_address`` variable and extends the ``kayobe overcloud
|
||||||
|
inventory discover`` command to discover the address from the Bifrost node
|
||||||
|
inventory.
|
Loading…
x
Reference in New Issue
Block a user