Browse Source

ClearLinux: remove special casing

- put package install in system_packages
- docker should be handled by the approriate roles if used as container
  engine
pull/12236/head
Max Gautier 4 months ago
parent
commit
f13b80cac0
Failed to extract signature
2 changed files with 3 additions and 16 deletions
  1. 16
      roles/bootstrap_os/tasks/clear-linux-os.yml
  2. 3
      roles/system_packages/vars/main.yml

16
roles/bootstrap_os/tasks/clear-linux-os.yml

@ -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

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

Loading…
Cancel
Save