Merge conflict resolved: archlinux support

This commit is contained in:
Xan Manning 2020-10-23 16:40:35 +01:00
commit 170bf5995f
9 changed files with 37 additions and 6 deletions

View File

@ -14,6 +14,7 @@ The host you're running Ansible from requires the following Python dependencies:
This role has been tested on Ansible 2.7.0+ against the following Linux Distributions:
- Amazon Linux 2
- Archlinux
- CentOS 8
- CentOS 7
- Debian 9

View File

@ -4,7 +4,7 @@
# Global/Cluster Configuration
##
# k3s state, options: installed, started, stopped, restarted, validated
# k3s state, options: installed, started, stopped, restarted, uninstalled, validated
# (default: installed)
k3s_state: installed

View File

@ -36,6 +36,9 @@ galaxy_info:
# platforms is a list of platforms, and each platform has a name and a list of versions.
#
platforms:
- name: Archlinux
versions:
- all
- name: EL
versions:
- 7

View File

@ -0,0 +1,15 @@
---
- name: Ensure docker is installed using Pacman
pacman:
name: docker
state: present
register: ensure_docker_prerequisites_installed
until: ensure_docker_prerequisites_installed is succeeded
retries: 3
delay: 10
notify:
- restart docker
become: "{{ k3s_become_for_package_install | ternary(true, false, k3s_become_for_all) }}"
- meta: flush_handlers

View File

@ -0,0 +1 @@
---

View File

@ -20,10 +20,10 @@
- include_tasks: build/install-docker-prerequisites-{{ ansible_os_family | lower }}.yml
- import_tasks: build/install-docker.yml
when: ansible_distribution | replace(" ", "-") | lower not in ['amazon', 'suse', 'opensuse-leap']
when: ansible_distribution | replace(" ", "-") | lower not in ['amazon', 'suse', 'opensuse-leap', 'archlinux']
- include_tasks: build/install-docker-{{ ansible_distribution | replace(" ", "-") | lower }}.yml
when: ansible_distribution | replace(" ", "-") | lower in ['amazon', 'suse', 'opensuse-leap']
when: ansible_distribution | replace(" ", "-") | lower in ['amazon', 'suse', 'opensuse-leap', 'archlinux']
when: ('docker' in k3s_runtime_config and k3s_runtime_config.docker)
and ('rootless' not in k3s_runtime_config or not k3s_runtime_config.rootless)

View File

@ -10,10 +10,10 @@
block:
- import_tasks: teardown/uninstall-docker.yml
when: ansible_distribution | replace(" ", "-") | lower not in ['amazon', 'suse', 'opensuse-leap']
when: ansible_distribution | replace(" ", "-") | lower not in ['amazon', 'suse', 'opensuse-leap', 'archlinux']
- include_tasks: teardown/uninstall-docker-{{ ansible_distribution | replace(" ", "-") | lower }}.yml
when: ansible_distribution | replace(" ", "-") | lower in ['amazon', 'suse', 'opensuse-leap']
when: ansible_distribution | replace(" ", "-") | lower in ['amazon', 'suse', 'opensuse-leap', 'archlinux']
- include_tasks: teardown/uninstall-docker-prerequisites-{{ ansible_os_family | lower }}.yml

View File

@ -19,7 +19,7 @@
become: "{{ k3s_become_for_kubectl | ternary(true, false, k3s_become_for_all) }}"
- name: Ensure uninstalled nodes are drained
command: "{{ k3s_install_dir }}/kubectl drain {{ item }} --ignore-daemonsets"
command: "{{ k3s_install_dir }}/kubectl drain {{ item }} --ignore-daemonsets --delete-local-data"
delegate_to: "{{ k3s_control_delegate }}"
run_once: true
when: item in kubectl_get_nodes_result.stdout

View File

@ -0,0 +1,11 @@
---
- name: Ensure docker is uninstalled using Pacman
pacman:
name: docker
state: absent
register: ensure_docker_uninstalled
until: ensure_docker_uninstalled is succeeded
retries: 3
delay: 10
become: "{{ k3s_become_for_uninstall | ternary(true, false, k3s_become_for_all) }}"