X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=roles%2Fdebian-base%2Ftasks%2Fmain.yml;h=38b56193402657c85ba4b6b0723a280bda848b79;hb=HEAD;hp=72a5b0b286071afc2990304612f2f2facafa9e3d;hpb=4005b4916547bee3900b77427bcf98efaa8a5621;p=AnsibleRoles.git

diff --git a/roles/debian-base/tasks/main.yml b/roles/debian-base/tasks/main.yml
index 72a5b0b..38b5619 100644
--- a/roles/debian-base/tasks/main.yml
+++ b/roles/debian-base/tasks/main.yml
@@ -4,42 +4,59 @@
 - name: install common packages
   tags:
     - packages
-  apt: >
-    state=installed
-    name={{ item }}
-  with_items:
-    - bash-completion
-    - ca-certificates
-    - curl
-    - debconf-utils
-    - etckeeper
-    - git
-    - htop
-    - less
-    - lsb-base
-    - lsb-release
-    - psmisc
-    - net-tools
-    - screen
-    - sudo
-    - telnet-ssl
-    - vim
+  apt:
+    state: present
+    name: [
+      'bash-completion',
+      'ca-certificates',
+      'curl',
+      'debconf-utils',
+      'etckeeper',
+      'git',
+      'htop',
+      'less',
+      'lsb-base',
+      'lsb-release',
+      'psmisc',
+      'net-tools',
+      'screen',
+      'sudo',
+      'vim',
+    ]
+
+- name: install common packages for Debian <10
+  tags:
+    - packages
+  apt:
+    state: present
+    name: [
+      'telnet-ssl',
+    ]
+  when: "ansible_distribution_major_version|int < 10"
+
+- name: install common packages for Debian >= 10
+  tags:
+    - packages
+  apt:
+    state: present
+    name: [
+      'telnet',
+    ]
+  when: "ansible_distribution_major_version|int >= 10"
 
 - name: install common packages (non Proxmox-VE hosts)
   tags:
     - packages
   apt: >
-    state=installed
-    name={{ item }}
-  with_items:
-    - busybox-static
+    state=present
+    name=busybox-static
   when: "ansible_kernel.find('pve') < 1"
 
 - name: install Linux kernel packages (amd64; non Proxmox-VE hosts, non OpenVZ guest)
   tags:
     - packages
   apt: >
-    state=installed
+    state=present
     name=linux-image-amd64
   when: "ansible_architecture == 'x86_64' and ansible_kernel.find('pve') < 1 and ansible_virtualization_type != 'openvz'"
 
@@ -47,6 +64,6 @@
   tags:
     - packages
   apt: >
-    state=installed
+    state=present
     name=linux-image-686-pae
   when: "ansible_architecture == 'i386' and ansible_kernel.find('pve') < 1 and ansible_virtualization_type != 'openvz'"