From 9128da538e124f5f832af2eb283d87e15070cb71 Mon Sep 17 00:00:00 2001 From: kirby Date: Tue, 27 May 2025 09:39:06 +0200 Subject: [PATCH] linting docker, add gitignore --- .gitignore | 1 + ansible/{.ansible-lint => ansible-lint} | 0 ansible/roles/docker/handlers/main.yml | 6 +-- ansible/roles/docker/tasks/main.yml | 58 ++++++++++++---------- ansible/roles/docker/vars/Debian-12.yml | 2 +- ansible/roles/docker/vars/Ubuntu-18.04.yml | 2 +- ansible/roles/docker/vars/Ubuntu-20.04.yml | 2 +- ansible/roles/docker/vars/Ubuntu-22.04.yml | 2 +- ansible/roles/docker/vars/Ubuntu-24.04.yml | 2 +- 9 files changed, 42 insertions(+), 33 deletions(-) rename ansible/{.ansible-lint => ansible-lint} (100%) diff --git a/.gitignore b/.gitignore index 1377554..0ca17ec 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ +ansible/.ansible *.swp diff --git a/ansible/.ansible-lint b/ansible/ansible-lint similarity index 100% rename from ansible/.ansible-lint rename to ansible/ansible-lint diff --git a/ansible/roles/docker/handlers/main.yml b/ansible/roles/docker/handlers/main.yml index 0750171..ff468bb 100644 --- a/ansible/roles/docker/handlers/main.yml +++ b/ansible/roles/docker/handlers/main.yml @@ -1,16 +1,16 @@ --- -- name: restart containerd +- name: Restart containerd ansible.builtin.systemd: name: containerd state: restarted -- name: restart docker +- name: Restart docker ansible.builtin.systemd: name: docker state: restarted -- name: restart multipathd +- name: Restart multipathd ansible.builtin.systemd: name: multipathd state: restarted diff --git a/ansible/roles/docker/tasks/main.yml b/ansible/roles/docker/tasks/main.yml index ea924ef..7cf7da5 100644 --- a/ansible/roles/docker/tasks/main.yml +++ b/ansible/roles/docker/tasks/main.yml @@ -1,5 +1,7 @@ -- name: set specific variables for distributions - include_vars: '{{ item }}' +--- + +- name: Set specific variables for distributions + ansible.builtin.include_vars: '{{ item }}' with_first_found: - '{{ ansible_distribution }}-{{ ansible_distribution_version }}.yml' - '{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml' @@ -9,7 +11,7 @@ - default.yml - name: Suppression anciennes versions de docker - apt: + ansible.builtin.apt: pkg: - docker - docker-engine @@ -17,7 +19,7 @@ state: absent - name: Installation des prérequis - apt: + ansible.builtin.apt: pkg: - apt-transport-https - ca-certificates @@ -26,40 +28,46 @@ - software-properties-common - nfs-common state: present - update_cache: yes + update_cache: true - name: Ajout de la clef GPG docker.com - apt_key: + ansible.builtin.apt_key: url: https://download.docker.com/linux/ubuntu/gpg state: present - name: Ajout du repo APT docker.com - apt_repository: - repo: deb [arch=amd64] https://download.docker.com/linux/{{ ansible_distribution|lower }} {{ ansible_distribution_release }} stable + ansible.builtin.apt_repository: + repo: deb [arch=amd64] https://download.docker.com/linux/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} stable state: present filename: docker -- name: Installation de docker dans la version {{ target_version }} - apt: +- name: Installation de docker dans la version {{ docker_target_version }} + ansible.builtin.apt: pkg: - - docker-ce={{ target_version }} - - docker-ce-cli={{ target_version }} + - docker-ce={{ docker_target_version }} + - docker-ce-cli={{ docker_target_version }} state: present - update_cache: yes + update_cache: true register: apt_out - name: Affichage sortie du module apt - debug: + ansible.builtin.debug: msg: - "{{ apt_out.stdout_lines }}" - "{{ apt_out.stderr_lines }}" - ignore_errors: yes + failed_when: apt_out.rc != 0 - name: Verrouillage des paquets docker-ce - command: apt-mark hold docker-ce docker-ce-cli containerd.io + ansible.builtin.dpkg_selections: + name: "{{ item }}" + selection: hold + with_items: + - docker-ce + - docker-ce-cli + - containerd.io -- name: adding cleaning cron - cron: +- name: Adding cleaning cron + ansible.builtin.cron: minute: "0" hour: "0" job: "/usr/bin/docker image prune -a -f >/dev/null 2>&1" @@ -97,8 +105,8 @@ dest: /etc/containerd/config.toml owner: root group: root - mode: '0755' - notify: restart containerd + mode: "0755" + notify: Restart containerd - name: Customise docker file daemon.json ansible.builtin.copy: @@ -106,8 +114,8 @@ dest: /etc/docker/daemon.json owner: root group: root - mode: '0755' - notify: restart docker + mode: "0755" + notify: Restart docker - name: Adding Multipathd blacklist for longhorn support ansible.builtin.blockinfile: @@ -117,15 +125,15 @@ blacklist { devnode "^sd[a-z0-9]+" } - notify: restart multipathd + notify: Restart multipathd -- name: start and enable iscsi daemon for longhorn support +- name: Start and enable iscsi daemon for longhorn support ansible.builtin.systemd_service: name: iscsid enabled: true state: started -- name: enable iscsi_tcp kernel module for longhorn support +- name: Enable iscsi_tcp kernel module for longhorn support community.general.modprobe: name: iscsi_tcp state: present diff --git a/ansible/roles/docker/vars/Debian-12.yml b/ansible/roles/docker/vars/Debian-12.yml index 9d373fe..6f979e7 100644 --- a/ansible/roles/docker/vars/Debian-12.yml +++ b/ansible/roles/docker/vars/Debian-12.yml @@ -1,3 +1,3 @@ --- -target_version: "5:24.0.7-1~debian.12~bookworm" +docker_target_version: "5:24.0.7-1~debian.12~bookworm" diff --git a/ansible/roles/docker/vars/Ubuntu-18.04.yml b/ansible/roles/docker/vars/Ubuntu-18.04.yml index 7e6e676..37e804f 100644 --- a/ansible/roles/docker/vars/Ubuntu-18.04.yml +++ b/ansible/roles/docker/vars/Ubuntu-18.04.yml @@ -1,3 +1,3 @@ --- -target_version: "5:18.09.9~3-0~ubuntu-bionic" +docker_target_version: "5:18.09.9~3-0~ubuntu-bionic" diff --git a/ansible/roles/docker/vars/Ubuntu-20.04.yml b/ansible/roles/docker/vars/Ubuntu-20.04.yml index f937774..2f0e6ba 100644 --- a/ansible/roles/docker/vars/Ubuntu-20.04.yml +++ b/ansible/roles/docker/vars/Ubuntu-20.04.yml @@ -1,3 +1,3 @@ --- -target_version: "5:20.10.9~3-0~ubuntu-focal" +docker_target_version: "5:20.10.9~3-0~ubuntu-focal" diff --git a/ansible/roles/docker/vars/Ubuntu-22.04.yml b/ansible/roles/docker/vars/Ubuntu-22.04.yml index 7130a94..7ba5110 100644 --- a/ansible/roles/docker/vars/Ubuntu-22.04.yml +++ b/ansible/roles/docker/vars/Ubuntu-22.04.yml @@ -1,3 +1,3 @@ --- -target_version: "5:20.10.23~3-0~ubuntu-jammy" +docker_target_version: "5:20.10.23~3-0~ubuntu-jammy" diff --git a/ansible/roles/docker/vars/Ubuntu-24.04.yml b/ansible/roles/docker/vars/Ubuntu-24.04.yml index 6bf4ea0..b9c3a16 100644 --- a/ansible/roles/docker/vars/Ubuntu-24.04.yml +++ b/ansible/roles/docker/vars/Ubuntu-24.04.yml @@ -1,3 +1,3 @@ --- -target_version: "5:27.5.1-1~ubuntu.24.04~noble" +docker_target_version: "5:27.5.1-1~ubuntu.24.04~noble"