Merge branch 'twans_15.3u1' into 'development'

Msingathi Majola · Msingathi Majola · commit dd23d18a3f0b · 2026-02-20T11:02:24.000Z
Twans 15.3u1

See merge request clustervision/trinityx-combined!456
diff --git a/site/k3s-alma.yml b/site/k3s-alma.yml
@@ -32,12 +32,9 @@
     - role: trinity/kubernetes
       tags: kubernetes, k3s
 
-    - role: trinity/wrapup-images
-      tags: wrapup-images
-
 - hosts: controllers
   roles:
-    - role: trinity/pack-images
+    - role: luna/osimage-pack
       vars:
          params:
             image_name: "{{ hostvars['localhost']['image_name'] }}"
diff --git a/site/k3s-centos.yml b/site/k3s-centos.yml
@@ -31,12 +31,9 @@
     - role: trinity/kubernetes-centos
       tags: kubernetes, k3s
 
-    - role: trinity/wrapup-images
-      tags: wrapup-images
-
 - hosts: controllers
   roles:
-    - role: trinity/pack-images
+    - role: luna/osimage-pack
       vars:
          params:
             image_name: "{{ hostvars['localhost']['image_name'] }}"
diff --git a/site/k3s-default.yml b/site/k3s-default.yml
@@ -34,12 +34,9 @@
     - role: trinity/kubernetes
       tags: kubernetes, k3s
 
-    - role: trinity/wrapup-images
-      tags: wrapup-images
-
 - hosts: controllers
   roles:
-    - role: trinity/pack-images
+    - role: luna/osimage-pack
       vars:
          params:
             image_name: "{{ hostvars['localhost']['image_name'] }}"
diff --git a/site/k3s-opensuse.yml b/site/k3s-opensuse.yml
@@ -41,12 +41,9 @@
     - role: trinity/kubernetes
       tags: kubernetes, k3s
 
-    - role: trinity/wrapup-images
-      tags: wrapup-images
-
 - hosts: controllers
   roles:
-    - role: trinity/pack-images
+    - role: luna/osimage-pack
       vars:
          params:
             image_name: "{{ hostvars['localhost']['image_name'] }}"
diff --git a/site/k3s-ubuntu.yml b/site/k3s-ubuntu.yml
@@ -36,12 +36,9 @@
     - role: trinity/kubernetes
       tags: kubernetes, k3s
 
-    - role: trinity/wrapup-images
-      tags: wrapup-images
-
 - hosts: controllers
   roles:
-    - role: trinity/pack-images
+    - role: luna/osimage-pack
       vars:
          params:
             image_name: "{{ hostvars['localhost']['image_name'] }}"
