merging 9.5 podman fixes

Author: wtripp180901

.github/workflows/trivyscan.yml

@@ -25,6 +25,20 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
+      - name: Override CI_CLOUD if PR label is present
+        if: ${{ github.event_name == 'pull_request' }}
+        run: |
+          # Iterate over the labels
+          labels=$(echo '${{ toJSON(github.event.pull_request.labels) }}' | jq -r '.[].name')
+          echo $labels
+          for label in $labels; do
+             if [[ $label == CI_CLOUD=* ]]; then
+              # Extract the value after 'CI_CLOUD='
+              CI_CLOUD_OVERRIDE=${label#CI_CLOUD=}
+              echo "CI_CLOUD=${CI_CLOUD_OVERRIDE}" >> $GITHUB_ENV
+            fi
+          done
+
       - name: Record settings for CI cloud
         run: |
           echo CI_CLOUD: ${{ env.CI_CLOUD }}

ansible/roles/podman/tasks/config.yml

@@ -55,6 +55,7 @@
       # Type Path Mode User Group Age Argument
       R! /tmp/containers-user-*
       R! /tmp/podman-run-*
+      R! /tmp/storage-run-*
     dest: /etc/tmpfiles.d/podman-local.conf
     owner: root
     group: root

requirements.yml

@@ -25,7 +25,7 @@ roles:
 
 collections:
   - name: containers.podman
-    version: 1.10.2
+    version: 1.16.2
   - name: community.grafana
     version: 1.5.4
   - name: https://github.com/stackhpc/ansible_collection_slurm_openstack_tools