playbook and xml file edits

Author: rocky Cloud User

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

@@ -1,7 +1,7 @@
 ---
 
 - name: Register baremetal compute nodes
-  hosts: localhost
+  hosts:  "{{ groups['controllers'][0] }}"
   vars:
     venv: "{{ virtualenv_path }}/openstack-cli"
   tasks:
@@ -27,7 +27,8 @@
     - baremetal
   vars:
     venv: "{{ virtualenv_path }}/openstack-cli"
-    controller_host: localhost
+    #todo: extract this as a variable
+    controller_host: "{{ groups['controllers'][0] }}"
   tasks:
     - name: Check Ironic variables are defined
       ansible.builtin.assert:

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

@@ -11,7 +11,7 @@
     - baremetal
   vars:
     venv: "{{ virtualenv_path }}/openstack-cli"
-    controller_host: localhost
+    controller_host: "{{ groups['controllers'][0] }}"
 
   tasks:
     - name: Check Ironic variables are defined
@@ -65,6 +65,7 @@
             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
 
@@ -80,19 +81,23 @@
             baseuri: "{{ ironic_redfish_address }}"
             username: "{{ ironic_redfish_username }}"
             password: "{{ ironic_redfish_password }}"
-          when: kayobe_bmc_up == ""
+          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 == ""
+        # - 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: "https://{{ ironic_driver_info['redfish_address'] }}"
+            url: "{{ ironic_driver_info['redfish_address'] }}/redfish/v1"
             method: GET
             status_code: 200
             validate_certs: false

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

@@ -2,7 +2,6 @@
 - name: Check baremetal compute node bmc is up
   hosts: baremetal
   gather_facts: false
-  become: true
   max_fail_percentage: >-
     {{ baremetal_compute_register_max_fail_percentage |
        default(baremetal_compute_max_fail_percentage) |
@@ -12,7 +11,7 @@
     - baremetal
   vars:
     venv: "{{ virtualenv_path }}/openstack-cli"
-    controller_host: localhost
+    controller_host: "{{ groups['controllers'][0] }}"
 
   tasks:
     - name: Show and check baremetal node
@@ -35,7 +34,7 @@
 
         - name: Check BMC is up
           ansible.builtin.uri:
-            url: "{{ ironic_driver_info['redfish_address'] + '/redfish/v1' }}"
+            url: "{{ ironic_driver_info['redfish_address'] }}/redfish/v1"
             method: GET
             status_code: 200
             validate_certs: false

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

@@ -2,7 +2,6 @@
 - name: Check baremetal node bmc is up
   hosts: baremetal
   gather_facts: false
-  become: true
   max_fail_percentage: >-
     {{ baremetal_compute_register_max_fail_percentage |
        default(baremetal_compute_max_fail_percentage) |
@@ -12,11 +11,11 @@
     - baremetal
   vars:
     venv: "{{ virtualenv_path }}/openstack-cli"
-    controller_host: controller0
+    controller_host: "{{ groups['controllers'][0] }}"
 
   tasks:
     - name: Show and check baremetal node
-      delegate_to: localhost
+      delegate_to: "{{ controller_host }}"
       vars:
         # NOTE: Without this, the controller's ansible_host variable will not
         # be respected when using delegate_to.

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

@@ -11,7 +11,7 @@
     - baremetal
   vars:
     venv: "{{ virtualenv_path }}/openstack-cli"
-    controller_host: localhost
+    controller_host: "{{ groups['controllers'][0] }}"
     cleaning_timeout: "{{ 60 * 20 }}" # 20 minutes
 
   tasks:
@@ -21,7 +21,6 @@
         # NOTE: Without this, the controller's ansible_host variable will not
         # be respected when using delegate_to.
         ansible_host: "{{ hostvars[controller_host].ansible_host | default(controller_host) }}"
-        agent_inspect_timeout: "{{ 60 * 20 }}" # 20 minutes
       environment: "{{ openstack_auth_env }}"
       block:
 
@@ -35,7 +34,7 @@
 
         - name: Check BMC is up
           ansible.builtin.uri:
-            url: "{{ ironic_driver_info['redfish_address'] + '/redfish/v1' }}"
+            url: "{{ ironic_driver_info['redfish_address'] }}/redfish/v1"
             method: GET
             status_code: 200
             validate_certs: false

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

@@ -1,6 +1,6 @@
 ---
-#- name: Ensure overcloud baremetal is enrolled
-#  ansible.builtin.import_playbook: ./baremetal-0-enroll-overcloud.yml
+- name: Ensure overcloud baremetal is enrolled
+  ansible.builtin.import_playbook: ./baremetal-0-enroll-overcloud.yml
 - name: Check BMC is up
   ansible.builtin.import_playbook: ./baremetal-1-check-bmc-up.yml
 - name: Do redfish inspection

etc/kayobe/environments/stackhpc-baremetal/kolla/config/ironic.conf

@@ -60,8 +60,7 @@ num_retries = 1
 inspection_network = "{{ inspection_net_name | default('inspect-net' )}}"
 
 [redfish]
-kernel_append_params = nofb nomodeset vga=normal console=tty0 console=ttyS0,115200n8 ipa-insecure=1 {% if internal_net_ip %}ipa-ntp-server={{ internal_net_ip }}{% endif %}
-
+kernel_append_params = nofb nomodeset vga=normal console=tty0 console=ttyS0,115200n8 ipa-insecure=1 {% if internal_net_ip %}ipa-ntp-server={{ internal_net_ip }}{% endif %} rootpwd="$$1$$Za/e7wKG$$aT8ydkGT514shSjwUZhFC/"
 [inspector]
 extra_kernel_params = ipa-collect-lldp=1 ipa-inspection-collectors=default,logs,pci-devices ipa-insecure=1
 hooks = ramdisk-error,validate-interfaces,ports,local-link-connection,parse-lldp,root-device,cpu-capabilities,architecture

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

@@ -30,6 +30,21 @@
       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:
@@ -45,7 +60,9 @@
                 capacity: '20GB'
                 pool: 'default'
             interfaces:
-              - network: 'breth1'
+              - network: 'vbmc-net'
+                mac: '{{ bikolla_mac_addresses[inventory_hostname] }}'
+                alias: vnet1
             start: false
             autostart: false
             boot_firmware: uefi

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

@@ -44,7 +44,7 @@
     <acpi/>
     <apic/>
   </features>
-  <cpu mode='host-passthrough' check='none' migratable='on'/>
+  <cpu mode='host-model' check='none'/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
@@ -225,10 +225,6 @@
       <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
     </rng>
   </devices>
-  <seclabel type='dynamic' model='selinux' relabel='yes'>
-    <label>system_u:system_r:svirt_t:s0:c77,c792</label>
-    <imagelabel>system_u:object_r:svirt_image_t:s0:c77,c792</imagelabel>
-  </seclabel>
   <seclabel type='dynamic' model='dac' relabel='yes'>
     <label>+107:+107</label>
     <imagelabel>+107:+107</imagelabel>

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

@@ -12,7 +12,6 @@
       <mode>0711</mode>
       <owner>0</owner>
       <group>0</group>
-      <label>system_u:object_r:virt_image_t:s0</label>
     </permissions>
   </target>
 </pool>