removed commented out tasks

Author: claudia-lola

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

@@ -58,43 +58,17 @@
             validate_certs: false
             timeout: 10
 
-        - name: Get firmware inventory (to check redfish auth)
-          community.general.redfish_info:
-            category: Update
-            command: GetFirmwareInventory
-            baseuri: "{{ ironic_redfish_address }}"
-            username: "{{ ironic_redfish_username }}"
-            password: "{{ ironic_redfish_password }}"
-          when: ironic_redfish_username is defined
-          register: firmware_inventory
-          failed_when: not firmware_inventory.redfish_facts.firmware.ret
-
-        # - name: Print fetched information
-        #   ansible.builtin.debug:
-        #     msg: "{{ firmware_inventory.redfish_facts.firmware | to_nice_json }}"
-
+        #TODO(ClaudiaWatson): add an optional BMC reboot into the flow
         - name: Reboot BMC
           community.general.redfish_command:
             category: Manager
             command: PowerReboot
-            resource_id: 1
-            baseuri: "{{ ironic_redfish_address }}"
             username: "{{ ironic_redfish_username }}"
             password: "{{ ironic_redfish_password }}"
           when:
             - kayobe_bmc_up == ""
             - ironic_redfish_username is defined
 
-        # - name: Wait 300 seconds for port 443 to become open
-        #   ansible.builtin.wait_for:
-        #     port: 443
-        #     host: "{{ ironic_redfish_address }}"
-        #     delay: 20
-        #     timeout: 300
-        #   when:
-        #     - kayobe_bmc_up == ""
-        #     - ironic_redfish_username is defined
-
         - name: Check BMC back up again
           ansible.builtin.uri:
             url: "{{ ironic_driver_info['redfish_address'] }}/redfish/v1"
@@ -104,8 +78,8 @@
             timeout: 10
           register: uri_output
           until: uri_output.status == 200
-          delay: 5
-          retries: 24 # Retries for 24 * 5 seconds = 120 seconds = 2 minutes
+          delay: 2
+          retries: 5 # Retries for 5 * 2 seconds = 10 seconds
 
         - name: Note when we are able to reach the bmc, the first time
           ansible.builtin.command:

etc/kayobe/environments/stackhpc-baremetal/ansible/diagnose-baremetal.yml

@@ -81,14 +81,3 @@
         - "{{ purge_faulty_baremetal }}"
         - "{{ bmnode_details.ironic_state not in ['available', 'active'] }}"
         - "{{ not bmnode_details.kayobe_first_provision_ts }}"
-
-    #- name: Build summary list
-    #  ansible.builtin.set_fact:
-    #    enrolment_report_all: "{{ (enrolment_report_all | default([])) + [ hostvars[item].enrolment_report_entry ] }}"
-    #  run_once: true
-    #  loop: "{{ groups['all'] | sort }}"
-
-    #- name: Pretty-print all nodes
-    #  ansible.builtin.debug:
-    #    msg: "{{ enrolment_report_all | to_nice_json }}"
-    #  run_once: true

etc/kayobe/environments/stackhpc-baremetal/ansible/download-host-image.yml

@@ -43,40 +43,6 @@
       # delay: 60
       become: true
 
-    #NOTE(jake): It would be nice to get the *real* checksum from Ark eventually.
-    # - name: Get checksum of file
-    #   ansible.builtin.stat:
-    #     path: /tmp/{{ overcloud_host_image_name }}.qcow2
-    #     checksum_algorithm: sha256
-    #   register: host_image
-
-    # - name: Write checksum to vars file
-    #   ansible.builtin.copy:
-    #     content: |
-    #       ---
-    #       # This file is autogenerated by Ansible; DO NOT EDIT!
-
-    #       stackhpc_overcloud_host_image_name: "{{ overcloud_host_image_name }}"
-    #       stackhpc_overcloud_host_image_checksum: "{{ host_image.stat.checksum }}"
-    #     dest: "{{ kayobe_env_config_path }}/stackhpc-overcloud-host-image.yml"
-    #   delegate_to: localhost
-    #   run_once: true
-
-    # - block:
-    #   - name: Copy the image to the Ironic volume
-    #     ansible.builtin.copy:
-    #       src: /tmp/{{ overcloud_host_image_name }}.qcow2
-    #       dest: /var/lib/docker/volumes/ironic/_data/{{ overcloud_host_image_name }}.qcow2
-    #       remote_src: true
-    #     become: true
-
-    #   - name: Make the image available to the Ironic HTTP container
-    #     community.docker.docker_container_exec:
-    #       container: ironic_http
-    #       command: "mv /var/lib/ironic/{{ overcloud_host_image_name }}.qcow2 /var/lib/ironic/httpboot"
-    #     become: true
-    #   when: overcloud_host_image_ironic | bool
-
     - name: Upload an image to Glance
       openstack.cloud.image:
         name: "{{ overcloud_host_image_name }}"

etc/kayobe/environments/stackhpc-baremetal/ansible/provision-overcloud-nova.yml

@@ -47,8 +47,6 @@
           when:
             - bmnode.provision_state not in ["active", "available"]
 
-## flavor creation only seems to show in openstack flavor list when
-## is_public: true, deploy server still can't find flavor.
         - name: Create flavor for baremetal
           openstack.cloud.compute_flavor:
             state: present

etc/kayobe/environments/stackhpc-sushy-baremetal/ansible/auto-setup.yml

@@ -14,14 +14,14 @@
       args:
         executable: /bin/bash
 
-    - name: Run Generate mac addresses playbook
+    - name: Run Generate Mac Addresses playbook
       ansible.builtin.shell: |
           source "$VIRTUAL_ENV/bin/activate"
           kayobe playbook run "$KAYOBE_CONFIG_PATH/environments/stackhpc-sushy-baremetal/ansible/generate-mac-addresses.yml"
       args:
         executable: /bin/bash
 
-    - name: Run Create virtual baremetal playbook
+    - name: Run Create Virtual Baremetal playbook
       ansible.builtin.shell: |
           source "$VIRTUAL_ENV/bin/activate"
           kayobe playbook run "$KAYOBE_CONFIG_PATH/environments/stackhpc-sushy-baremetal/ansible/create-virtual-baremetal.yml"

etc/kayobe/environments/stackhpc-sushy-baremetal/ansible/vbmc-node.xml.j2

@@ -32,12 +32,7 @@
   <os firmware='efi'>
     <type arch='x86_64' machine='pc-q35-rhel9.4.0'>hvm</type>
     <firmware>
-{% if bikolla_enable_secureboot %}
-      <feature enabled='yes' name='secure-boot'/>
-      <feature enabled='yes' name='enrolled-keys'/>
-{% else %}
       <feature enabled='no' name='secure-boot'/>
-{% endif %}
     </firmware>
   </os>
   <features>

etc/kayobe/ipa.yml

@@ -35,7 +35,6 @@ ipa_build_dib_elements_extra:
   - extra-hardware
   - mellanox
   - burn-in
-  - devuser
 
 # List of Diskimage Builder (DIB) elements to use when building IPA images.
 # Default is combination of ipa_build_dib_elements_default and
@@ -48,10 +47,6 @@ ipa_build_dib_elements_extra:
 
 # Dictionary of additional environment variables to provide to Diskimage
 # Builder (DIB) during IPA image build.
-ipa_build_dib_env_extra:
-  DIB_DEV_USER_USERNAME: devuser
-  DIB_DEV_USER_PWDLESS_SUDO: yes
-  DIB_DEV_USER_PASSWORD: yes
 #TODO(ClaudiaWatson): remove DIB_IPA_COMPRESS_CMD for Flamingo
 ipa_build_dib_env_extra:
   DIB_IPA_COMPRESS_CMD: 'zstd -19'