Merge branch 'main' into rl9_v2

Author: sjpb

.github/workflows/fatimage.yml

@@ -48,8 +48,6 @@ jobs:
           cd packer/
           packer init .
           PACKER_LOG=1 packer build -only openstack.openhpc -on-error=${{ vars.PACKER_ON_ERROR }} -var-file=$PKR_VAR_environment_root/${{ vars.CI_CLOUD }}.pkrvars.hcl openstack.pkr.hcl
-        env:
-          TESTUSER_PASSWORD: ${{ secrets.TEST_USER_PASSWORD }}
 
       - name: Get created image name from manifest
         id: manifest
@@ -60,5 +58,5 @@ jobs:
             sleep 30
           done
           IMAGE_NAME=$(openstack image show -f value -c name $IMAGE_ID)
-          echo "::set-output name=IMAGE_ID::$IMAGE_ID"
-          echo "::set-output name=IMAGE_NAME::$IMAGE_NAME"
+          echo "IMAGE_ID=${IMAGE_ID}" >> "$GITHUB_OUTPUT"
+          echo "IMAGE_NAME=${IMAGE_NAME}" >> "$GITHUB_OUTPUT"

ansible/roles/basic_users/library/terminate_user_sessions.py

@@ -56,13 +56,11 @@ def run_module():
 
     _, sessions_stdout, _ = module.run_command("loginctl --no-legend list-sessions", check_rc=True)
     for line in sessions_stdout.splitlines():
-        try:
-            session, uid, user = line.split()
-        except ValueError:
-            raise ValueError('failed to split "%s"' % line)
-            
+        session_info = line.split()
+        user = session_info[1]
+        session_id = session_info[0]
         if user == module.params['user']:
-            _, sessions_stdout, _ = module.run_command("loginctl terminate-session %s" % session, check_rc=True)
+            _, sessions_stdout, _ = module.run_command("loginctl terminate-session %s" % session_id, check_rc=True)
             result['changed'] = True
 
     # successful module exit:

environments/.caas/inventory/group_vars/all/cluster.yml

@@ -23,4 +23,4 @@ appliances_state_dir: /var/lib/state
 
 # Defaults for caas-provided extravars:
 cluster_project_manila_share: false
-cluster_home_manila_share: "{{ cluster_project_manila_share }}"
+cluster_home_manila_share: false

environments/.caas/inventory/group_vars/all/manila.yml

@@ -7,7 +7,8 @@ caas_manila_home:
 
 cluster_project_manila_share_name: azimuth-project-share
 caas_manila_project:
-  share_name: "{{ cluster_project_manila_share_name }}"
+  share_name: "{{ cluster_project_manila_share_name | default('azimuth-project-share') }}"
+  share_user: "{{ cluster_project_manila_share_user | default(omit) }}"
   mount_path: /project
   mount_user: root
   mount_group: root