test bullseye

tasks/docker.yml

@@ -9,71 +9,42 @@
 - name: clean apt Docker
   become: true
   apt:
-    name: docker,docker-engine,docker.io,containerd,runc,bridge-utils
+    name: docker,docker-engine,docker.io,docker-io,docker-ee
     state: absent
     autoremove: yes
     purge: yes
-  when: ansible_os_family == 'Debian' and ansible_distribution_release != 'focal'
-- name: clean apt Docker for focal
-  become: true
-  apt:
-    name: docker-ce,docker-ee
-    state: absent
-    autoremove: yes
-    purge: yes
-  when: ansible_os_family == 'Debian' and ansible_distribution_release == 'focal'
-- name: Docker apt 源公钥
-  become: true
-  apt_key:
-    url: '{{mirror_docker}}/linux/{{ ansible_distribution|lower }}/gpg'
-  when: ansible_os_family == 'Debian' and ansible_distribution_release != 'focal'
+  when: ansible_os_family == 'Debian'
 - name: target distribution for non-sid
   set_fact:
     docker_distribution: '{{ ansible_distribution_release|lower }}'
-  when: ansible_distribution_release != 'sid'
+  when: ansible_distribution_release != 'sid' and ansible_distribution_release != 'bullseye'
 - name: target distribution for sid
   set_fact:
     docker_distribution: buster
-  when: ansible_distribution_release == 'sid'
-- name: Docker apt 源
-  become: true
-  apt_repository:
-    repo: 'deb {{mirror_docker}}/linux/{{ ansible_distribution|lower }} {{ docker_distribution }} stable'
-    filename: docker
-  when: ansible_os_family == 'Debian' and ansible_distribution_release != 'focal'
-- name: Docker apt 源 清理
+  when: ansible_distribution_release == 'sid' or ansible_distribution_release == 'bullseye'
+- name: Docker apt 源公钥
   become: true
-  apt_repository:
-    repo: 'deb {{mirror_docker}}/linux/{{ ansible_distribution|lower }} {{ docker_distribution }} stable'
-    filename: docker
-    state: absent
-  when: ansible_os_family == 'Debian' and ansible_distribution_release == 'focal'
-- name: Docker apt 源 清理
+  apt_key:
+    url: '{{mirror_docker}}/linux/{{ docker_distribution }}/gpg'
+  when: ansible_os_family == 'Debian'
+- name: Docker apt 源
   become: true
   apt_repository:
-    repo: 'deb [arch=amd64] {{mirror_docker}}/linux/{{ ansible_distribution|lower }} {{ docker_distribution }} stable'
+    repo: 'deb {{mirror_docker}}/linux/{{ docker_distribution }} {{ docker_distribution }} stable'
     filename: docker
-    state: absent
-  when: ansible_os_family == 'Debian' and ansible_distribution_release == 'focal'
+  when: ansible_os_family == 'Debian'
 - name: 安装 Docker (apt)
   become: true
   apt:
     name: docker-ce
     update_cache: yes
-  when: ansible_os_family == 'Debian' and ansible_distribution_release != 'focal'
+  when: ansible_os_family == 'Debian'
   notify: restart_docker
 - name: Docker extra packages
   become: true
   apt:
     name: python-backports-shutil-get-terminal-size,python-backports.ssl-match-hostname
-  when: ansible_os_family == 'Debian' and ansible_distribution_release != 'focal' and ansible_distribution_release != 'sid'
-- name: 安装 Docker (focal)
-  become: true
-  apt:
-    name: docker.io
-    update_cache: yes
-  when: ansible_os_family == 'Debian' and ansible_distribution_release == 'focal'
-  notify: restart_docker
+  when: ansible_os_family == 'Debian' and ansible_distribution_release != 'sid'
 - name: clean yum Docker
   become: true
   yum:

tasks/utility.yml

@@ -70,9 +70,9 @@
   set_fact:
     target_distribution: 'focal'
   when: ansible_distribution == 'Ubuntu' and upgrade
-- name: move to buster
+- name: move to bullseye
   set_fact:
-    target_distribution: 'buster'
+    target_distribution: 'bullseye'
   when: ansible_distribution == 'Debian' and upgrade and ansible_distribution_release != 'sid'
 - name: 系统源 (apt)
   become: true
@@ -101,14 +101,6 @@
     autoremove: yes
     purge: yes
   when: ansible_distribution == 'Ubuntu' and upgrade and ansible_distribution_release != 'focal'
-- name: remove not proper installed wireguard
-  become: true
-  apt:
-    name: wireguard,wireguard-tools,wireguard-dkms
-    state: absent
-    autoremove: yes
-    purge: yes
-  when: ansible_distribution == 'Ubuntu' and upgrade and ansible_distribution_release != 'focal'
 - name: remove not proper installed wireguard repo
   become: true
   file: