slurm user uid and gid alignment

discovery/roles/configure_ochami/templates/cloud_init/ci-group-slurm_control_node_x86_64.yaml.j2

@@ -244,9 +244,12 @@
 
       runcmd:
          - /usr/local/bin/set-ssh.sh
-         - useradd -mG wheel -p '$6$VHdSKZNm$O3iFYmRiaFQCemQJjhfrpqqV7DdHBi5YpY6Aq06JSQpABPw.3d8PQ8bNY9NuZSmDv7IL/TsrhRJ6btkgKaonT.' testuser # Required??
-         - groupadd -r {{ slurm_group_name }}
-         - useradd -r -g {{ slurm_group_name }} -d {{ home_dir }} -s /sbin/nologin {{ user }}
+
+        # slurm user and group
+         - getent group {{ slurm_group_name }} >/dev/null || groupadd -r {{ slurm_group_name }}
+         - groupmod -g {{ slurm_gid }} {{ slurm_group_name }}
+         - getent passwd {{ user }} >/dev/null || useradd -r -g {{ slurm_group_name }} -d {{ home_dir }} -s /sbin/nologin {{ user }}
+         - usermod -u {{ slurm_uid }} {{ user }}
 
         # Create directories for nfs and mount all
          - mkdir -p /var/log/slurm /etc/slurm {{ home_dir }} /etc/my.cnf.d /etc/munge /var/lib/mysql /var/log/mariadb /cert /var/log/track /var/lib/packages

discovery/roles/configure_ochami/templates/cloud_init/ci-group-slurm_node_x86_64.yaml.j2

@@ -381,9 +381,12 @@
       runcmd:
         - /usr/local/bin/set-ssh.sh
         - /usr/local/bin/install_nvidia_driver.sh
-        - useradd -mG wheel -p '$6$VHdSKZNm$O3iFYmRiaFQCemQJjhfrpqqV7DdHBi5YpY6Aq06JSQpABPw.3d8PQ8bNY9NuZSmDv7IL/TsrhRJ6btkgKaonT.' testuser
-        - groupadd -r {{ slurm_group_name }}
-        - useradd -r -g {{ slurm_group_name }} -d {{ home_dir }} -s /sbin/nologin {{ user }}
+
+        # slurm user and group
+         - getent group {{ slurm_group_name }} >/dev/null || groupadd -r {{ slurm_group_name }}
+         - groupmod -g {{ slurm_gid }} {{ slurm_group_name }}
+         - getent passwd {{ user }} >/dev/null || useradd -r -g {{ slurm_group_name }} -d {{ home_dir }} -s /sbin/nologin {{ user }}
+         - usermod -u {{ slurm_uid }} {{ user }}
 
         - /usr/local/bin/configure_dirs_and_mounts.sh
         - cp /cert/pulp_webserver.crt /etc/pki/ca-trust/source/anchors && update-ca-trust

discovery/roles/slurm_config/vars/main.yml

@@ -56,6 +56,7 @@ conf_in_nfs: true
 input_project_dir: "{{ hostvars['localhost']['input_project_dir'] }}"
 cluster_name: cluster # TODO: direct load vars omnia_config.yml
 slurm_uid: 6001
+slurm_gid: 6001
 slurm_user: slurm
 slurm_user_group: slurm
 restart_slurm_services: "{{ hostvars['localhost']['restart_slurm_services'] }}"

telemetry/roles/service_k8s_telemetry/tasks/update_metadata_file.yml

@@ -117,6 +117,8 @@
   ansible.builtin.set_fact:
     kube_compute_nodes: >-
       {{ service_cluster_metadata | dict2items
+         | selectattr('value.parent_status', 'defined')
+         | selectattr('value.parent_status', 'equalto', true)
          | selectattr("value.role", "defined")
          | selectattr("value.role", "search", "^service_kube_node")
          | sort(attribute="key") | list }}