edits to baremetal scripts and ironic.yml

Author: claudia-lola

etc/kayobe/environments/stackhpc-baremetal/ansible/baremetal-0-enroll-baremetal.yml

@@ -34,7 +34,7 @@
       ansible.builtin.assert:
         that:
           - ironic_driver is defined
-          - ironic_driver_info is defined
+          - ironic_redfish_address is defined
           - ironic_properties is defined
           - ironic_resource_class is defined
         fail_msg: One or more Ironic variables are undefined.
@@ -63,27 +63,31 @@
               --driver {{ ironic_driver }} \
               --driver-info redfish_system_id={{ ironic_redfish_system_id }} \
               --driver-info redfish_address={{ ironic_redfish_address }} \
+              {% if ironic_redfish_username %}
               --driver-info redfish_username={{ ironic_redfish_username }} \
+              {% endif %}
+              {% if ironic_redfish_password %}
               --driver-info redfish_password={{ ironic_redfish_password }} \
+              {% endif %}
               --driver-info redfish_verify_ca={{ ironic_redfish_verify_ca }} \
               {% for key, value in ironic_properties.items() %}
               --property {{ key }}={{ value }} \
               {% endfor %}
-              --resource-class {{ ironic_resource_class }}
+              --resource-class {{ ironic_resource_class }} \
               {% if ironic_boot_interface %}
-              --boot-interface {{ ironic_boot_interface }}
+              --boot-interface {{ ironic_boot_interface }} \
               {% endif %}
               {% if ironic_inspect_interface %}
-              --inspect-interface {{ ironic_inspect_interface }}
+              --inspect-interface {{ ironic_inspect_interface }} \
               {% endif %}
               {% if ironic_management_interface %}
-              --management-interface {{ ironic_management_interface }}
+              --management-interface {{ ironic_management_interface }} \
               {% endif %}
               {% if ironic_network_interface %}
-              --network-interface {{ ironic_network_interface }}
+              --network-interface {{ ironic_network_interface }} \
               {% endif %}
               {% if ironic_raid_interface %}
-              --raid-interface {{ ironic_raid_interface }}
+              --raid-interface {{ ironic_raid_interface }} \
               {% endif %}
           when:
             - node_show.rc != 0

etc/kayobe/environments/stackhpc-baremetal/ansible/baremetal-1-check-bmc-up.yml

@@ -18,7 +18,7 @@
       ansible.builtin.assert:
         that:
           - ironic_driver is defined
-          - ironic_driver_info is defined
+          - ironic_redfish_address is defined
           - ironic_properties is defined
           - ironic_resource_class is defined
         fail_msg: One or more Ironic variables are undefined.
@@ -52,7 +52,7 @@
 
         - name: Check BMC is up
           ansible.builtin.uri:
-            url: "{{ ironic_driver_info['redfish_address'] + '/redfish/v1' }}"
+            url: "{{ ironic_redfish_address + '/redfish/v1' }}"
             method: GET
             status_code: 200
             validate_certs: false
@@ -71,7 +71,7 @@
 
         - name: Check BMC back up again
           ansible.builtin.uri:
-            url: "{{ ironic_driver_info['redfish_address'] }}/redfish/v1"
+            url: "{{ ironic_redfish_address + '/redfish/v1' }}"
             method: GET
             status_code: 200
             validate_certs: false

etc/kayobe/environments/stackhpc-baremetal/ansible/baremetal-2-ensure-redfish-inspect.yml

@@ -34,7 +34,7 @@
 
         - name: Check BMC is up
           ansible.builtin.uri:
-            url: "{{ ironic_driver_info['redfish_address'] }}/redfish/v1"
+            url: "{{ ironic_redfish_address + '/redfish/v1' }}"
             method: GET
             status_code: 200
             validate_certs: false

etc/kayobe/environments/stackhpc-baremetal/ansible/baremetal-3-ensure-agent-inspect.yml

@@ -34,7 +34,7 @@
 
         - name: Check BMC is up
           ansible.builtin.uri:
-            url: "{{ ironic_driver_info['redfish_address'] + '/redfish/v1' }}"
+            url: "{{ ironic_redfish_address + '/redfish/v1' }}"
             method: GET
             status_code: 200
             validate_certs: false

etc/kayobe/environments/stackhpc-baremetal/ansible/baremetal-4-clean.yml

@@ -34,7 +34,7 @@
 
         - name: Check BMC is up
           ansible.builtin.uri:
-            url: "{{ ironic_driver_info['redfish_address'] }}/redfish/v1"
+            url: "{{ ironic_redfish_address + '/redfish/v1' }}"
             method: GET
             status_code: 200
             validate_certs: false

etc/kayobe/environments/stackhpc-baremetal/inventory/group_vars/baremetal-redfish/ironic

@@ -5,8 +5,8 @@ ironic_driver: redfish
 #these vars used to be within ironic_driver_info
 ironic_redfish_system_id: "/redfish/v1/Systems/1"
 ironic_redfish_address: "192.168.33.3:34343"
-ironic_redfish_username:
-ironic_redfish_password:
+ironic_redfish_username: ""
+ironic_redfish_password: ""
 ironic_redfish_verify_ca: false
 
 ironic_resource_class: "example_resource_class"

etc/kayobe/environments/stackhpc-baremetal/ironic.yml

@@ -1,135 +1,14 @@
 ---
-###############################################################################
-# Ironic configuration.
 
-# Specify the list of hardware types to load during service initialization.
-kolla_ironic_enabled_hardware_types:
-  - redfish
-
-# Specify the list of bios interfaces to load during service initialization.
-#kolla_ironic_enabled_bios_interfaces:
-
-# Default bios interface to be used for nodes that do not have bios_interface
-# field set.
-#kolla_ironic_default_bios_interface:
-
-# Specify the list of boot interfaces to load during service initialization.
-kolla_ironic_enabled_boot_interfaces:
-  - redfish-virtual-media
-  - redfish-https
-
-# Default boot interface to be used for nodes that do not have boot_interface
-# field set.
-kolla_ironic_default_boot_interface: redfish-virtual-media
-
-# Specify the list of console interfaces to load during service initialization.
-#kolla_ironic_enabled_console_interfaces:
-
-# Default console interface to be used for nodes that do not have
-# console_interface field set.
-#kolla_ironic_default_console_interface:
-
-# Specify the list of deploy interfaces to load during service initialization.
-#kolla_ironic_enabled_deploy_interfaces:
-
-# Default deploy interface to be used for nodes that do not have
-# deploy_interface field set.
-#kolla_ironic_default_deploy_interface:
-
-# Specify the list of inspect interfaces to load during service initialization.
 kolla_ironic_enabled_inspect_interfaces:
   - redfish
   - agent
 
-# Default inspect interface to be used for nodes that do not have
-# inspect_interface field set.
-kolla_ironic_default_inspect_interface: redfish
-
-# Specify the list of management interfaces to load during service
-# initialization.
 kolla_ironic_enabled_management_interfaces:
   - redfish
+  - ipmitool
 
-# Default management interface to be used for nodes that do not have
-# management_interface field set.
-#kolla_ironic_default_management_interface:
-
-# Specify the list of network interfaces to load during service initialization.
 kolla_ironic_enabled_network_interfaces:
   - neutron
   - flat
   - noop
-
-# Default network interface to be used for nodes that do not have
-# network_interface field set.
-kolla_ironic_default_network_interface: neutron
-
-# Specify the list of power interfaces to load during service initialization.
-kolla_ironic_enabled_power_interfaces:
-  - redfish
-
-# Default power interface to be used for nodes that do not have power_interface
-# field set.
-#kolla_ironic_default_power_interface:
-
-# Specify the list of raid interfaces to load during service initialization.
-#kolla_ironic_enabled_raid_interfaces:
-
-# Default raid interface to be used for nodes that do not have
-# raid_interface field set.
-kolla_ironic_default_raid_interface: agent
-
-# Specify the list of rescue interfaces to load during service initialization.
-#kolla_ironic_enabled_rescue_interfaces:
-
-# Default rescue interface to be used for nodes that do not have
-# rescue_interface field set.
-#kolla_ironic_default_rescue_interface:
-
-# Specify the list of storage interfaces to load during
-# service initialization.
-#kolla_ironic_enabled_storage_interfaces:
-
-# Default storage interface to be used for nodes that do not
-# have storage_interface field set.
-#kolla_ironic_default_storage_interface:
-
-# Specify the list of vendor interfaces to load during service initialization.
-#kolla_ironic_enabled_vendor_interfaces:
-
-# Default vendor interface to be used for nodes that do not have
-# vendor_interface field set.
-#kolla_ironic_default_vendor_interface:
-
-# Name of the Neutron network to use for cleaning.
-#kolla_ironic_cleaning_network:
-
-# Name of the Neutron network to use for provisioning.
-#kolla_ironic_provisioning_network:
-
-# List of default kernel parameters to append for baremetal PXE boot.
-#kolla_ironic_pxe_append_params_default:
-
-# List of additional kernel parameters to append for baremetal PXE boot.
-#kolla_ironic_pxe_append_params_extra:
-
-# List of kernel parameters to append for baremetal PXE boot.
-#kolla_ironic_pxe_append_params:
-
-###############################################################################
-# Ironic Node Configuration
-
-# Whether or not to enable the serial consoles on post configure
-#ironic_serial_console_autoenable:
-
-# This defines the start of the range of TCP ports to used for the IPMI socat
-# serial consoles
-#ironic_serial_console_tcp_pool_start:
-
-# This defines the end of the range of TCP ports to used for the IPMI socat
-# serial consoles
-#ironic_serial_console_tcp_pool_end:
-
-###############################################################################
-# Dummy variable to allow Ansible to accept this file.
-workaround_ansible_issue_8743: yes