refactor(tmachine): share container runtime detection

Signed-off-by: Evan Lezar <elezar@nvidia.com>

Author: elezar

tests/ansible/roles/keycloak/tasks/main.yaml

@@ -5,54 +5,69 @@
 - name: Wait for SSH
   ansible.builtin.wait_for_connection:
 
-- name: Check Docker socket
-  become: true
-  ansible.builtin.stat:
-    path: /var/run/docker.sock
-  register: keycloak_docker_socket
+- name: Detect tmachine container runtime
+  ansible.builtin.include_role:
+    name: tmachine_container_runtime
 
-- name: Select Keycloak container runtime
+- name: Set Keycloak runtime values
   ansible.builtin.set_fact:
-    keycloak_runtime: "{{ 'docker' if keycloak_docker_socket.stat.exists else 'podman' }}"
+    keycloak_runtime_user: >-
+      {{ 'tmachine' if tmachine_container_runtime_is_rootless else 'root' }}
+    keycloak_runtime_home: >-
+      {{ '/home/tmachine' if tmachine_container_runtime_is_rootless else '/root' }}
+    keycloak_runtime_state_directory: >-
+      {{ '/home/tmachine/.local/share/openshell-keycloak'
+         if tmachine_container_runtime_is_rootless else keycloak_state_directory }}
 
 - name: Require Keycloak container runtime
   become: true
+  become_user: "{{ keycloak_runtime_user }}"
   ansible.builtin.command:
     argv:
-      - "{{ keycloak_runtime }}"
+      - "{{ tmachine_container_runtime_name }}"
       - --version
+  environment:
+    HOME: "{{ keycloak_runtime_home }}"
   changed_when: false
 
 - name: Create Keycloak state directory
   become: true
   ansible.builtin.file:
-    path: "{{ keycloak_state_directory }}"
+    path: "{{ keycloak_runtime_state_directory }}"
     state: directory
+    owner: "{{ keycloak_runtime_user }}"
+    group: "{{ keycloak_runtime_user }}"
     mode: "0755"
 
 - name: Install Keycloak realm fixture
   become: true
   ansible.builtin.copy:
     src: "{{ keycloak_realm_file }}"
-    dest: "{{ keycloak_state_directory }}/realm.json"
+    dest: "{{ keycloak_runtime_state_directory }}/realm.json"
+    owner: "{{ keycloak_runtime_user }}"
+    group: "{{ keycloak_runtime_user }}"
     mode: "0644"
 
 - name: Remove an existing Keycloak fixture
   become: true
+  become_user: "{{ keycloak_runtime_user }}"
   ansible.builtin.command:
     argv:
-      - "{{ keycloak_runtime }}"
+      - "{{ tmachine_container_runtime_name }}"
       - rm
       - --force
       - "{{ keycloak_container_name }}"
+  environment:
+    HOME: "{{ keycloak_runtime_home }}"
   changed_when: false
   failed_when: false
 
 - name: Start Keycloak fixture
   become: true
+  become_user: "{{ keycloak_runtime_user }}"
   ansible.builtin.command:
     argv:
-      - "{{ keycloak_runtime }}"
+      - "{{ tmachine_container_runtime_name }}"
       - run
       - --detach
       - --name
@@ -64,10 +79,12 @@
       - --env
       - "KEYCLOAK_ADMIN_PASSWORD={{ keycloak_admin_password }}"
       - --volume
-      - "{{ keycloak_state_directory }}/realm.json:/opt/keycloak/data/import/realm.json:ro,z"
+      - "{{ keycloak_runtime_state_directory }}/realm.json:/opt/keycloak/data/import/realm.json:ro,z"
       - "{{ keycloak_image }}"
       - start-dev
       - --import-realm
+  environment:
+    HOME: "{{ keycloak_runtime_home }}"
   changed_when: true
 
 - name: Wait for Keycloak discovery endpoint
@@ -83,13 +100,16 @@
 
 - name: Read Keycloak logs after failed health check
   become: true
+  become_user: "{{ keycloak_runtime_user }}"
   ansible.builtin.command:
     argv:
-      - "{{ keycloak_runtime }}"
+      - "{{ tmachine_container_runtime_name }}"
       - logs
       - --tail
       - "30"
       - "{{ keycloak_container_name }}"
+  environment:
+    HOME: "{{ keycloak_runtime_home }}"
   register: keycloak_logs
   changed_when: false
   failed_when: false

tests/ansible/roles/openshell_gateway/tasks/detect.yaml

@@ -2,50 +2,21 @@
 # SPDX-License-Identifier: Apache-2.0
 
 ---
-- name: Resolve tmachine UID
-  ansible.builtin.command:
-    argv:
-      - id
-      - -u
-      - tmachine
-  changed_when: false
-  register: openshell_tmachine_uid
+- name: Detect tmachine container runtime
+  ansible.builtin.include_role:
+    name: tmachine_container_runtime
 
-- name: Check Docker socket
-  become: true
-  ansible.builtin.stat:
-    path: /var/run/docker.sock
-  register: openshell_docker_socket
-
-- name: Check rootful Podman socket
-  become: true
-  ansible.builtin.stat:
-    path: /run/podman/podman.sock
-  register: openshell_rootful_podman_socket
-
-- name: Check rootless Podman socket
-  become: true
-  ansible.builtin.stat:
-    path: "/run/user/{{ openshell_tmachine_uid.stdout }}/podman/podman.sock"
-  register: openshell_rootless_podman_socket
-
-- name: Require exactly one container runtime socket
-  ansible.builtin.assert:
-    that:
-      - >-
-        (openshell_docker_socket.stat.exists | int)
-        + (openshell_rootful_podman_socket.stat.exists | int)
-        + (openshell_rootless_podman_socket.stat.exists | int) == 1
-    fail_msg: Expected exactly one Docker or Podman socket
-
-- name: Select container runtime
+- name: Set OpenShell gateway runtime values
   ansible.builtin.set_fact:
-    openshell_gateway_driver: "{{ 'docker' if openshell_docker_socket.stat.exists else 'podman' }}"
-    openshell_gateway_user: "{{ 'root' if openshell_rootful_podman_socket.stat.exists else 'tmachine' }}"
-    openshell_gateway_home: "{{ '/root' if openshell_rootful_podman_socket.stat.exists else '/home/tmachine' }}"
-    openshell_gateway_uid: "{{ '0' if openshell_rootful_podman_socket.stat.exists else openshell_tmachine_uid.stdout }}"
-    openshell_gateway_bind_address: "{{ '127.0.0.1:17670' if openshell_docker_socket.stat.exists else '0.0.0.0:17670' }}"
-    openshell_runtime_socket: >-
-      {{ '/var/run/docker.sock' if openshell_docker_socket.stat.exists
-         else '/run/podman/podman.sock' if openshell_rootful_podman_socket.stat.exists
-         else '/run/user/' ~ openshell_tmachine_uid.stdout ~ '/podman/podman.sock' }}
+    openshell_gateway_driver: "{{ tmachine_container_runtime_name }}"
+    openshell_gateway_user: >-
+      {{ 'root' if tmachine_container_runtime_name == 'podman'
+         and not tmachine_container_runtime_is_rootless else 'tmachine' }}
+    openshell_gateway_home: >-
+      {{ '/root' if tmachine_container_runtime_name == 'podman'
+         and not tmachine_container_runtime_is_rootless else '/home/tmachine' }}
+    openshell_gateway_uid: >-
+      {{ '0' if tmachine_container_runtime_name == 'podman'
+         and not tmachine_container_runtime_is_rootless else tmachine_container_runtime_tmachine_uid.stdout }}
+    openshell_gateway_bind_address: "{{ '127.0.0.1:17670' if tmachine_container_runtime_name == 'docker' else '0.0.0.0:17670' }}"
+    openshell_runtime_socket: "{{ tmachine_container_runtime_socket }}"

tests/ansible/roles/tmachine_container_runtime/tasks/main.yaml

@@ -0,0 +1,50 @@
+# SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+---
+- name: Resolve tmachine UID
+  ansible.builtin.command:
+    argv:
+      - id
+      - -u
+      - tmachine
+  changed_when: false
+  register: tmachine_container_runtime_tmachine_uid
+
+- name: Check Docker socket
+  become: true
+  ansible.builtin.stat:
+    path: /var/run/docker.sock
+  register: tmachine_container_runtime_docker_socket
+
+- name: Check rootful Podman socket
+  become: true
+  ansible.builtin.stat:
+    path: /run/podman/podman.sock
+  register: tmachine_container_runtime_rootful_podman_socket
+
+- name: Check rootless Podman socket
+  become: true
+  ansible.builtin.stat:
+    path: "/run/user/{{ tmachine_container_runtime_tmachine_uid.stdout }}/podman/podman.sock"
+  register: tmachine_container_runtime_rootless_podman_socket
+
+- name: Require exactly one container runtime socket
+  ansible.builtin.assert:
+    that:
+      - >-
+        (tmachine_container_runtime_docker_socket.stat.exists | int)
+        + (tmachine_container_runtime_rootful_podman_socket.stat.exists | int)
+        + (tmachine_container_runtime_rootless_podman_socket.stat.exists | int) == 1
+    fail_msg: Expected exactly one Docker or Podman socket
+
+- name: Select tmachine container runtime
+  ansible.builtin.set_fact:
+    tmachine_container_runtime_name: >-
+      {{ 'docker' if tmachine_container_runtime_docker_socket.stat.exists else 'podman' }}
+    tmachine_container_runtime_is_rootless: >-
+      {{ tmachine_container_runtime_rootless_podman_socket.stat.exists }}
+    tmachine_container_runtime_socket: >-
+      {{ '/var/run/docker.sock' if tmachine_container_runtime_docker_socket.stat.exists
+         else '/run/podman/podman.sock' if tmachine_container_runtime_rootful_podman_socket.stat.exists
+         else '/run/user/' ~ tmachine_container_runtime_tmachine_uid.stdout ~ '/podman/podman.sock' }}