Merge pull request #654 from stackhpc/zed-yoga-merge

zed: merge yoga

Author: markgoddard

.automation

@@ -24,8 +24,9 @@ if [ ! -z ${KAYOBE_ENVIRONMENT:+x} ]; then
     # SMSLab is currently running with 1G switches. This causes tests using volumes and images to fail if
     # the concurrency is set too high.
     export TEMPEST_CONCURRENCY=1
-    export KAYOBE_AUTOMATION_TEMPEST_LOADLIST=tempest-full
-    export KAYOBE_AUTOMATION_TEMPEST_SKIPLIST=ci-multinode
+    # Uncomment this to perform a full tempest test
+    # export KAYOBE_AUTOMATION_TEMPEST_LOADLIST=tempest-full
+    # export KAYOBE_AUTOMATION_TEMPEST_SKIPLIST=ci-multinode-tempest-full
   fi
 
 fi

.automation.conf/config.sh

@@ -211,7 +211,8 @@ jobs:
           container-sync.yml \
           --repo stackhpc/stackhpc-release-train \
           --ref main \
-          -f filter="$filter"
+          -f filter="$filter" \
+          -f sync-old-images=false
         env:
           GITHUB_TOKEN: ${{ secrets.STACKHPC_RELEASE_TRAIN_TOKEN }}
 

…ion.conf/tempest/skip-lists/ci-multinode …est/skip-lists/ci-multinode-tempest-full.automation.conf/tempest/skip-lists/ci-multinode renamed to .automation.conf/tempest/skip-lists/ci-multinode-tempest-full .automation.conf/tempest/skip-lists/ci-multinode renamed to .automation.conf/tempest/skip-lists/ci-multinode-tempest-full

@@ -27,57 +27,70 @@
     growroot_vg: "rootvg"
     # Don't assume facts are present.
     os_family: "{{ ansible_facts.os_family | default('Debian' if os_distribution == 'ubuntu' else 'RedHat') }}"
+    # Ignore LVM check
+    growroot_ignore_lvm_check: false
 
   tasks:
-    - name: Check if growpart is installed
+    - name: Check LVM status
       shell:
-        cmd: type growpart
+        cmd: vgdisplay | grep -q lvm2
       changed_when: false
       failed_when: false
       check_mode: false
-      register: growpart_check
+      register: lvm_check
       become: true
 
-    - name: Ensure growpart is installed
-      package:
-        name: "{% if os_family == 'RedHat' %}cloud-utils-growpart{% else %}cloud-guest-utils{% endif %}"
-        state: present
-        cache_valid_time: "{{ apt_cache_valid_time if os_family == 'Debian' else omit }}"
-        update_cache: "{{ True if os_family == 'Debian' else omit }}"
-      become: True
-      when: growpart_check.rc != 0
+    - block:
+        - name: Check if growpart is installed
+          shell:
+            cmd: type growpart
+          changed_when: false
+          failed_when: false
+          check_mode: false
+          register: growpart_check
+          become: true
 
-    - name: Get root PV device
-      command: "pvs --select vg_name={{ growroot_vg }} --reportformat json"
-      register: pvs
-      become: True
-      changed_when: False
-      check_mode: false
+        - name: Ensure growpart is installed
+          package:
+            name: "{% if os_family == 'RedHat' %}cloud-utils-growpart{% else %}cloud-guest-utils{% endif %}"
+            state: present
+            cache_valid_time: "{{ apt_cache_valid_time if os_family == 'Debian' else omit }}"
+            update_cache: "{{ true if os_family == 'Debian' else omit }}"
+          become: true
+          when: growpart_check.rc !=0
+
+        - name: Get root PV device
+          command: "pvs --select vg_name={{ growroot_vg }} --reportformat json"
+          register: pvs
+          become: true
+          changed_when: false
+          check_mode: false
 
-    - name: Fail if root PV device not found
-      fail:
-        msg: >
-          Expected LVM physical volume devices not found in volume group {{ growroot_vg }}
-      when: (pvs.stdout | from_json).report[0].pv | length == 0
+        - name: Fail if root PV device not found
+          fail:
+            msg: >
+              Expected LVM physical volume devices not found in volume group {{ growroot_vg }}
+          when: (pvs.stdout | from_json).report[0].pv | length == 0
 
-    - name: Grow partition
-      command: "growpart {{ disk }} {{ part_num }}"
-      vars:
-        pv: "{{ pvs.stdout | from_json }}"
-        disk_tmp: "{{ pv.report[0].pv[0].pv_name[:-1] }}"
-        disk: "{{ disk_tmp[:-1] if disk_tmp[-1] == 'p' else disk_tmp }}"
-        part_num: "{{ pv.report[0].pv[0].pv_name[-1] }}"
-      become: True
-      failed_when: "growpart.rc != 0 and 'NOCHANGE' not in growpart.stdout"
-      changed_when: "'NOCHANGE' not in growpart.stdout"
-      register: growpart
+        - name: Grow partition
+          command: "growpart {{ disk }} {{ part_num }}"
+          vars:
+            pv: "{{ pvs.stdout | from_json }}"
+            disk_tmp: "{{ pv.report[0].pv[0].pv_name[:-1] }}"
+            disk: "{{ disk_tmp[:-1] if disk_tmp[-1] == 'p' else disk_tmp }}"
+            part_num: "{{ pv.report[0].pv[0].pv_name[-1] }}"
+          become: true
+          failed_when: "growpart.rc != 0 and 'NOCHANGE' not in growpart.stdout"
+          changed_when: "'NOCHANGE' not in growpart.stdout"
+          register: growpart
 
-    - name: Grow LVM PV
-      command: "pvresize {{ disk }}"
-      vars:
-        pv: "{{ pvs.stdout | from_json }}"
-        disk: "{{ pv.report[0].pv[0].pv_name }}"
-      become: True
+        - name: Grow LVM PV
+          command: "pvresize {{ disk }}"
+          vars:
+            pv: "{{ pvs.stdout | from_json }}"
+            disk: "{{ pv.report[0].pv[0].pv_name }}"
+          become: true
+      when: lvm_check.rc == 0 or growroot_ignore_lvm_check
 #      when: "'NOCHANGE' not in growpart.stdout"
 # Commenting out the conditional because growpart is already triggered by cloud-init - hence it emits NOCHANGE
 # Cloud-Inits growpart implementation has a bug https://bugzilla.redhat.com/show_bug.cgi?id=2122575

.github/workflows/stackhpc-container-image-build.yml

@@ -44,14 +44,18 @@ format_output() {
 nvme_version="$(nvme version | awk '$1 == "nvme" {print $3}')"
 echo "nvmecli{version=\"${nvme_version}\"} 1" | format_output
 
-# Get devices
-device_list="$(nvme list -o json | jq -r '.Devices | .[].DevicePath')"
+# Get devices (DevicePath and PhysicalSize)
+device_info="$(nvme list -o json | jq -c '.Devices[] | {DevicePath: .DevicePath, PhysicalSize: .PhysicalSize}')"
 
 # Loop through the NVMe devices
-for device in ${device_list}; do
+echo "$device_info" | while read -r device_data; do
+  device=$(echo "$device_data" | jq -r '.DevicePath')
   json_check="$(nvme smart-log -o json "${device}")"
   disk="${device##*/}"
 
+  physical_size=$(echo "$device_data" | jq -r '.PhysicalSize')
+  echo "physical_size_bytes{device=\"${disk}\"} ${physical_size}"
+
   # The temperature value in JSON is in Kelvin, we want Celsius
   value_temperature="$(echo "$json_check" | jq '.temperature - 273')"
   echo "temperature_celsius{device=\"${disk}\"} ${value_temperature}"

etc/kayobe/ansible/growroot.yml

@@ -7,6 +7,7 @@ nova_compute_virt_type: qemu
 # Reduce the control plane's memory footprint by limiting the number of worker
 # processes to one per-service.
 openstack_service_workers: "1"
+openstack_service_rpc_workers: "1"
 
 glance_backend_ceph: "yes"
 cinder_backend_ceph: "yes"

etc/kayobe/ansible/scripts/nvmemon.sh

@@ -12,4 +12,4 @@ os_distribution: "{{ lookup('pipe', '. /etc/os-release && echo $ID') | trim }}"
 # SELinux.
 
 # Avoid a reboot.
-selinux_do_reboot: false
+selinux_state: disabled

etc/kayobe/environments/aufn-ceph/kolla/globals.yml

@@ -63,7 +63,7 @@ stackhpc_barbican_role_id_file_path: "/tmp/barbican-role-id"
 ###############################################################################
 
 # Avoid a reboot.
-selinux_do_reboot: false
+selinux_state: disabled
 
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.