config changes

Author: rocky Cloud User

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

@@ -110,34 +110,6 @@
           changed_when: true
           when: kayobe_agent_inspect_done == ""
 
-        - name: Move to neutron interface, assuming its a multi-tenant node
-          ansible.builtin.command:
-            cmd: |
-              {{ venv }}/bin/openstack baremetal node set {{ inventory_hostname }} --network-interface neutron
-          register: node_set
-          failed_when:
-            - node_set.rc != 0
-          changed_when: true
-          # do it slowly due to ironic api issues
-          throttle: 3
-          when:
-            - kayobe_agent_inspect_done == ""
-            - ironic_network_interface == "neutron"
-
-        - name: Remove network overrides for multi-tenant nodes
-          ansible.builtin.command:
-            cmd: |
-              {{ venv }}/bin/openstack baremetal node unset {{ inventory_hostname }} --driver-info inspection_network --driver-info cleaning_network --driver-info provision_network
-          register: node_set
-          failed_when:
-            - node_set.rc != 0
-          changed_when: true
-          # do it slowly due to ironic api issues
-          throttle: 3
-          when:
-            - kayobe_agent_inspect_done == ""
-            - ironic_network_interface == "neutron"
-
         - name: Note when agent inspection is done
           ansible.builtin.command:
             cmd: |

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

@@ -89,6 +89,43 @@
             --raid-interface agent {{ inventory_hostname }}
           when:
             - kayobe_clean_done == ""
+            - ironic_target_raid_config is defined
+
+        - name: Move to neutron interface, assuming its a multi-tenant node
+          ansible.builtin.command:
+            cmd: |
+              {{ venv }}/bin/openstack baremetal node set {{ inventory_hostname }} --network-interface neutron
+          register: node_set
+          failed_when:
+            - node_set.rc != 0
+          changed_when: true
+          when:
+            - kayobe_clean_done == ""
+            - ironic_network_interface == "neutron"
+
+        - name: Move to flat interface, if required
+          ansible.builtin.command:
+            cmd: |
+              {{ venv }}/bin/openstack baremetal node set {{ inventory_hostname }} --network-interface flat --driver-info inspection_network={{ ironic_flat_provisioning_network }} --driver-info cleaning_network={{ ironic_flat_provisioning_network }} --driver-info provision_network={{ ironic_flat_provisioning_network }}
+          register: node_set
+          failed_when:
+            - node_set.rc != 0
+          changed_when: true
+          when:
+            - kayobe_clean_done == ""
+            - ironic_network_interface == "flat"
+
+        - name: Remove network overrides for multi-tenant nodes
+          ansible.builtin.command:
+            cmd: |
+              {{ venv }}/bin/openstack baremetal node unset {{ inventory_hostname }} --driver-info inspection_network --driver-info cleaning_network --driver-info provision_network
+          register: node_set
+          failed_when:
+            - node_set.rc != 0
+          changed_when: true
+          when:
+            - kayobe_clean_done == ""
+            - ironic_network_interface == "neutron"
 
         - name: Clean node and make it available
           ansible.builtin.command:

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

@@ -13,4 +13,5 @@ ironic_redfish_verify_ca: false
 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_properties: {}
+ironic_network_interface: "flat"

etc/kayobe/environments/stackhpc-sushy-baremetal/ansible/create-virtual-baremetal.yml

@@ -30,21 +30,6 @@
       delegate_to: localhost
       run_once: true
 
-    - name: Define vBMC network
-      community.libvirt.virt_net:
-        command: define
-        name: vbmc-net
-        xml: "{{ lookup('template', sushy_directory  + '/vbmc-net.xml.j2') }}"
-      delegate_to: localhost
-      run_once: true
-
-    - name: Start vBMC network
-      community.libvirt.virt_net:
-        state: active
-        name: vbmc-net
-      delegate_to: localhost
-      run_once: true
-
     - import_role:
         name: stackhpc.libvirt-vm
       vars:
@@ -60,9 +45,7 @@
                 capacity: '20GB'
                 pool: 'default'
             interfaces:
-              - network: 'vbmc-net'
-                mac: '{{ bikolla_mac_addresses[inventory_hostname] }}'
-                alias: vnet1
+              - network: 'breth1'
             start: false
             autostart: false
             boot_firmware: uefi

etc/kayobe/environments/stackhpc-sushy-baremetal/stackhpc-ci.yml

@@ -0,0 +1,10 @@
+---
+
+stackhpc_release_pulp_username: "skc-ci-aio"
+stackhpc_release_pulp_password: !vault |
+  $ANSIBLE_VAULT;1.1;AES256
+  31386366383365666135336331663635396237623139306362633933636233613765663731666338
+  3633633736333936383439623066653663333964343234350a393137383537316164323837386437
+  36613139323161643766666565643739373037623363636234343965343436653261326238393566
+  3837336661653962340a316631366463623138623530373133336665376433633437306631383666
+  30333461333535363433363336663664316634343432633766346564323833346663