support different systems 2

roles/prepare/tasks/debian.yml

@@ -6,18 +6,18 @@
 
 # 删除默认安装
 - name: 删除ubuntu默认安装
-  shell: "apt remove -y {{ item }}"
+  package:
-  with_items:
+    name:
-    - ufw
+      - ufw
-    - lxd
+      - lxd
-    - lxcfs
+      - lxcfs
-    - lxc-common
+      - lxc-common
-  when: ansible_distribution == "Ubuntu"
+    state: absent
   ignore_errors: true
 
 # 安装基础软件包
 - name: 安装 ubuntu/debian基础软件
-  apt: 
+  package: 
     name:
       - conntrack           # network connection cleanup 用到
       - jq                  # 轻量JSON处理程序，安装docker查询镜像需要

roles/prepare/tasks/main.yml

@@ -1,8 +1,8 @@
-- import_tasks: ubuntu.yml
+- import_tasks: debian.yml
-  when: 'ansible_distribution in ["Ubuntu","Debian"]'
+  when: 'ansible_distribution_file_variety in ["Debian"]'
 
-- import_tasks: centos.yml
+- import_tasks: redhat.yml
-  when: 'ansible_distribution in ["CentOS","RedHat","Amazon","Aliyun"]' 
+  when: 'ansible_distribution_file_variety in ["RedHat"]' 
 
 # 公共系统参数设置
 - import_tasks: common.yml

roles/prepare/tasks/redhat.yml

@@ -1,13 +1,14 @@
 - name: 删除centos/redhat默认安装
-  shell: "yum remove -y {{ item }}"
+  package:
-  with_items:
+    name:
-    - firewalld
+      - firewalld
-    - python-firewall
+      - python-firewall
-    - firewalld-filesystem
+      - firewalld-filesystem
+    state: absent
   ignore_errors: true
 
 - name: 安装基础软件包
-  yum: 
+  package: 
     name: 
       - conntrack-tools     # ipvs 模式需要
       - libseccomp          # 安装containerd需要