Merge "Enabled hardware type 'ucs' does not exist"

playbooks/roles/bifrost-ironic-install/README.md

@@ -84,9 +84,11 @@ In case your HW needs a kernel option to boot, set the following variable:
 
 extra_kernel_options: Default undefined.
 
-When testing, the default ironic conductor hardware type is "ipmi". When
-testing mode has not been engaged, hardware types can be enabled using
-the "enabled_hardware_types" variable, which defaults to "ipmi, ilo, ucs".
+Hardware types can be enabled using the "enabled_hardware_types" variable,
+which defaults to "ipmi, ilo, cisco-ucs-managed, cisco-ucs-standalone".
+
+Enabled interfaces can be set via the "enabled_boot_interfaces",
+"enabled_management_interfaces", and "enabled_power_interfaces" variables.
 
 By default, PXE driver baseline support, in terms of installation of the
 iSCSI client and configuration of sudoers and rootwrap configuration is

playbooks/roles/bifrost-ironic-install/defaults/main.yml

@@ -84,8 +84,11 @@ ironicinspectorclient_git_folder: /opt/stack/python-ironic-inspector-client
 staging_drivers_git_url: http://git.openstack.org/cgit/openstack/ironic-staging-drivers
 
 # TODO(TheJulia): Add redfish to this list.
-enabled_hardware_types: "ipmi,ilo,ucs"
+enabled_hardware_types: "ipmi,ilo,cisco-ucs-managed"
 default_deploy_interface: "direct"
+enabled_boot_interfaces: "ilo-virtual-media,pxe"
+enabled_management_interfaces: "ilo,ipmitool,ucsm"
+enabled_power_interfaces: "ilo,ipmitool,ucsm"
 
 # DEPRECATED: Ironic is removing classic drivers in Rocky. Please see
 # enabled_hardware_types.

playbooks/roles/bifrost-ironic-install/tasks/install.yml

@@ -52,14 +52,14 @@
      package=proliantutils
      state=present
      extra_args="-c {{ upper_constraints_file }}"
-  when: skip_install is not defined and testing | bool != true
+  when: skip_install is not defined
 
 - name: "UcsSdk - Install from pip"
   include: pip_install.yml
     package=UcsSdk
     version=0.8.1.9
     extra_args="-c {{ upper_constraints_file }}"
-  when: skip_install is not defined and testing | bool != true
+  when: skip_install is not defined
 
 - name: "Install iSCSI client if PXE driver support is enabled"
   action: "{{ ansible_pkg_mgr }} name={{ iscsi_client_package }} state=present"

playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2

@@ -5,6 +5,7 @@
 
 
 [DEFAULT]
+debug = {{ testing | bool }}
 # NOTE(TheJulia): Until Bifrost supports neutron or some other network
 # configuration besides a flat network where bifrost orchustrates the
 # control instead of ironic, noop is the only available network driver.
@@ -14,16 +15,12 @@ default_deploy_interface = {{ default_deploy_interface }}
 enabled_inspect_interfaces = no-inspect,inspector
 default_inspect_interface = inspector
 {% endif %}
+enabled_boot_interfaces = {{ enabled_boot_interfaces }}
+enabled_management_interfaces = {{ enabled_management_interfaces }}
+enabled_power_interfaces = {{ enabled_power_interfaces }}
 
-{% if testing | bool == true %}
-debug = true
-# Default enable ipmi for CI testing
-enabled_hardware_types = ipmi
-{% else %}
 enabled_hardware_types = {{ enabled_hardware_types }}
 enabled_drivers = {{ enabled_drivers }}
-debug = false
-{% endif %}
 
 rabbit_userid = ironic
 rabbit_password = {{ ironic_db_password }}