From f13b80cac00d387d1f562fba3da12f2422676165 Mon Sep 17 00:00:00 2001
From: Max Gautier <mg@max.gautier.name>
Date: Mon, 19 May 2025 17:33:21 +0200
Subject: [PATCH] ClearLinux: remove special casing

- put package install in system_packages
- docker should be handled by the approriate roles if used as container
  engine
---
 roles/bootstrap_os/tasks/clear-linux-os.yml | 16 ----------------
 roles/system_packages/vars/main.yml         |  3 +++
 2 files changed, 3 insertions(+), 16 deletions(-)
 delete mode 100644 roles/bootstrap_os/tasks/clear-linux-os.yml

diff --git a/roles/bootstrap_os/tasks/clear-linux-os.yml b/roles/bootstrap_os/tasks/clear-linux-os.yml
deleted file mode 100644
index 2e41eaa01..000000000
--- a/roles/bootstrap_os/tasks/clear-linux-os.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-# ClearLinux ships with Python installed
-
-- name: Install basic package to run containers
-  package:
-    name: containers-basic
-    state: present
-
-- name: Make sure docker service is enabled
-  systemd_service:
-    name: docker
-    masked: false
-    enabled: true
-    daemon_reload: true
-    state: started
-  become: true
diff --git a/roles/system_packages/vars/main.yml b/roles/system_packages/vars/main.yml
index b26924047..c07f70bfc 100644
--- a/roles/system_packages/vars/main.yml
+++ b/roles/system_packages/vars/main.yml
@@ -27,6 +27,9 @@ pkgs:
   container-selinux:
     - "{{ ansible_os_family == 'RedHat' }}"
     - "{{ 'k8s_cluster' in group_names }}"
+  containers-basic:
+    - "{{ ansible_os_family == 'ClearLinux' }}"
+    - "{{ 'k8s_cluster' in group_names }}"
   curl: []
   device-mapper:
     - "{{ ansible_os_family == 'Suse' or ansible_distribution == 'openEuler' }}"