diff --git a/ansible/inventory/group_vars/all/bmc b/ansible/inventory/group_vars/all/bmc index 5da5afb8be65cfd209caf19fe1a73c5282bd2e86..2298fc070fa7ee7cf9f6af73c17f7a3c0de42944 100644 --- a/ansible/inventory/group_vars/all/bmc +++ b/ansible/inventory/group_vars/all/bmc @@ -13,3 +13,6 @@ ipmi_username: # Password to use to access a host's BMC via IPMI. ipmi_password: + +# Address to use to access a host's BMC via Redfish. +redfish_address: diff --git a/ansible/overcloud-inventory-discover.yml b/ansible/overcloud-inventory-discover.yml index 2e88951e07e93da0d71606928f31d269bc4dcd48..c4ab1498adaddd4f647a2a8ad17d9c7f262cc294 100644 --- a/ansible/overcloud-inventory-discover.yml +++ b/ansible/overcloud-inventory-discover.yml @@ -46,9 +46,10 @@ and host not in ignore_hosts %} {% set hostvars=ironic_inventory._meta.hostvars[host] %} {% 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 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 %} {% endfor %} diff --git a/etc/kayobe/bmc.yml b/etc/kayobe/bmc.yml index ea10df37fa41ee1ed4f27843931f546dd44eb8bd..b29ecf6704e1c44303c3f29d10fdddaeabe6eadb 100644 --- a/etc/kayobe/bmc.yml +++ b/etc/kayobe/bmc.yml @@ -14,6 +14,9 @@ # Password to use to access a host's BMC via IPMI. #ipmi_password: +# Address to use to access a host's BMC via Redfish. +#redfish_address: + ############################################################################### # Dummy variable to allow Ansible to accept this file. workaround_ansible_issue_8743: yes diff --git a/releasenotes/notes/discover-redfish-address-6517d8a03d8c1a37.yaml b/releasenotes/notes/discover-redfish-address-6517d8a03d8c1a37.yaml new file mode 100644 index 0000000000000000000000000000000000000000..d8fe398fa199bc86b96eb974565212e98ba76ad3 --- /dev/null +++ b/releasenotes/notes/discover-redfish-address-6517d8a03d8c1a37.yaml @@ -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.