Merge pull request #998 from mira-miracoli/jenkins-update

Changes to hxr.admin-tools

roles/hxr.admin-tools/vars/main.yml → roles/hxr.admin-tools/defaults/main.yml

@@ -15,11 +15,10 @@ admin_packages:
   - net-tools
   - unzip
   - mutt
-  - byobu
+  - "{{ 'byobu' if ansible_distribution_major_version < '9' else omit }}"
   - tmpwatch
   - rclone
   # centos specific
   - setools-console
   - yum-utils
   - bind-utils
-

roles/hxr.admin-tools/tasks/main.yml

@@ -1,24 +1,12 @@
 ---
 - name: Install useful tools
   yum:
-    name: "{{ admin_packages }}"
+    name: "{{ admin_packages  }}"
     state: installed
 
-- name: Check if firewalld is already installed
-  yum:
-    list: firewalld
-  # If not installed yum_list.results[*].yumstate != installed
-  register: yum_list
-
-- name: Stop firewalld
-  service:
-    name: firewalld
-    state: stopped
-    enabled: no
-  when: yum_list.results | selectattr("yumstate", "match", "installed") | list | length != 0
-
 - name: Start atop
   service:
     name: atop
     state: started
     enabled: yes
+  when: "'atop' in admin_packages"