Merge "Add redfish_address variable and support discovering it"

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:

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 %}
 

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

releasenotes/notes/discover-redfish-address-6517d8a03d8c1a37.yaml

+---
+features:
+  - |
+    Adds a new ``redfish_address`` variable and extends the ``kayobe overcloud
+    inventory discover`` command to discover the address from the Bifrost node
+    inventory.