added auto-setup playbook for sushy env, edits for baremetal env playbooks

Author: claudia-lola

etc/kayobe/environments/stackhpc-baremetal/README.rst

@@ -0,0 +1 @@
+#todo

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

@@ -67,8 +67,6 @@
           failed_when:
             - node_set.rc != 0
           changed_when: true
-          # do it slowly due to ironic api issues
-          throttle: 3
           when:
             - provision_state == "inspect failed"
             - kayobe_agent_inspect_done == ""
@@ -81,8 +79,6 @@
           failed_when:
             - node_set.rc != 0
           changed_when: true
-          # do it slowly due to ironic api issues
-          throttle: 3
           when:
             - kayobe_agent_inspect_done == ""
             - inspect_interface == "redfish"
@@ -95,8 +91,6 @@
           failed_when:
             - node_set.rc != 0
           changed_when: true
-          # do it slowly due to ironic api issues
-          throttle: 3
           when:
             - kayobe_agent_inspect_done == ""
 

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

@@ -1,6 +1,6 @@
 ---
 - name: Node enrolment health check
-  hosts: baremetal-compute
+  hosts: baremetal
   gather_facts: false
   connection: local
   vars:

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

@@ -33,54 +33,59 @@
         force_basic_auth: true
         unredirected_headers:
           - Authorization
-        dest: /tmp/{{ overcloud_host_image_name }}.qcow2
+        #dest: /tmp/{{ overcloud_host_image_name }}.qcow2
+        dest: "/var/lib/docker/volumes/ironic/_data/{{ overcloud_host_image_name }}.qcow2"
+        tmp_dest: "/var/lib/docker/volumes/ironic/_data/"
         mode: "0644"
       register: image_download_result
-      until: image_download_result.status_code in [200, 304]
-      retries: 3
-      delay: 60
+      # until: image_download_result.status_code in [200, 304]
+      # retries: 3
+      # 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: 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!
+    # - 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
+    #       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
+    # - 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: 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 }}"
         container_format: bare
         disk_format: qcow2
         state: present
-        filename: /tmp/{{ overcloud_host_image_name }}.qcow2
+        #filename: /tmp/{{ overcloud_host_image_name }}.qcow2
+        filename: /var/lib/docker/volumes/ironic/_data/{{ overcloud_host_image_name }}.qcow2
       run_once: true
       environment: "{{ openstack_auth_env }}"
       when: overcloud_host_image_glance | bool
+      become: true

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

@@ -47,6 +47,33 @@
           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
+            is_public: false
+            name: "{{ flavor }}"
+            ram: "{{ 42 * 1024 }}"
+            vcpus: 42
+            disk: 10
+            ephemeral: 10
+            extra_specs: "{{ {
+              ('resources:CUSTOM_' ~ ironic_resource_class | upper ): 1,
+              'resources:VCPU': 0,
+              'resources:DISK_GB': 0,
+              'resources:MEMORY_MB': 0
+            } }}"
+          # todo: Support mutiple resource classes
+          run_once: true
+
+        - name: Create key pair for baremetal
+          openstack.cloud.keypair:
+              state: present
+              name:  "{{ ironic_provision_key_name }}"
+              # use the key kayobe is using to bootstrap with?
+              public_key_file: "{{ ssh_public_key_path }}"
+
         - name: Create port
           openstack.cloud.port:
             state: "{{ 'absent' if force_server_delete else 'present' }}"
@@ -57,6 +84,11 @@
           delegate_to: localhost
           register: bmport
 
+        - name: Set unlimited core quota for project
+          openstack.cloud.quota:
+            name: "admin"
+            cores: -1
+
         # TODO: we should wait till we can reach ssh, via jump host
         - name: Deploy Server
           openstack.cloud.server:
@@ -65,7 +97,7 @@
             nics:
               - port-id: "{{ bmport.port.id }}"
             image: "{{ image }}"
-            flavor: "{{ flavor  }}"
+            flavor: "{{ flavor }}"
             key_name: "{{ key_name }}"
             availability_zone: "::{{ bmnode.id }}"
             timeout: 1800 # wait 30 mins for build

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

@@ -14,4 +14,9 @@ ironic_redfish_system_id: "/redfish/v1/Systems/1"
 ironic_resource_class: "example_resource_class"
 ironic_capabilities: "boot_option:local,boot_mode:uefi"
 ironic_properties: {}
-ironic_network_interface: "flat"
+ironic_network_interface: "flat"
+# settings for provision-nova.yml
+ironic_provision_network: "provision-net"
+ironic_provision_flavor: "example_resource_class"
+ironic_provision_image: "overcloud-rocky-9-2025.1-20250930T144255"
+ironic_provision_key_name: "stack"

etc/kayobe/environments/stackhpc-sushy-baremetal/README.rst

@@ -0,0 +1 @@
+#todo

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

@@ -0,0 +1,29 @@
+---
+- hosts: localhost
+  gather_facts: false
+
+  environment:
+    VIRTUAL_ENV: "{{ lookup('env', 'VIRTUAL_ENV') }}"
+    KAYOBE_CONFIG_PATH: "{{ lookup('env', 'KAYOBE_CONFIG_PATH') }}"
+
+  tasks:
+    - name: Run Sushy Emulator playbook
+      ansible.builtin.shell: |
+          source "$VIRTUAL_ENV/bin/activate"
+          kayobe playbook run "$KAYOBE_CONFIG_PATH/environments/stackhpc-sushy-baremetal/ansible/sushy-emulator.yml"
+      args:
+        executable: /bin/bash
+
+    - 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
+      ansible.builtin.shell: |
+          source "$VIRTUAL_ENV/bin/activate"
+          kayobe playbook run "$KAYOBE_CONFIG_PATH/environments/stackhpc-sushy-baremetal/ansible/create-virtual-baremetal.yml"
+      args:
+        executable: /bin/bash