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' }}"