Update "apt" tasks to use lists

[AnsibleRoles.git] / roles / debian-base / tasks / main.yml

diff --git a/roles/debian-base/tasks/main.yml b/roles/debian-base/tasks/main.yml
index 326bb6c5fab1dd6a7907e7adbe17a337d9d06166..199cf46d72388a18754a293ab0ee3ad50a7cc7f5 100644 (file)
--- a/roles/debian-base/tasks/main.yml
+++ b/roles/debian-base/tasks/main.yml
@@ -1,79 +1,50 @@
 ---
-# debian-base tasks
+# tasks file for debian-base
 
-- name: 'apt(8): Disable "package diffs"'
-  tags:
-    - apt
-    - packages
-  lineinfile: >
-    create=yes
-    dest=/etc/apt/apt.conf
-    group=root
-    line='Acquire::PDiffs "false";'
-    mode=644
-    owner=root
-
-- name: "aptitude(8): Don't install recommended packages by default"
+- name: install common packages
   tags:
-    - apt
     - packages
-  lineinfile: >
-    create=yes
-    dest=/root/.aptitude/config
-    group=root
-    line='Apt::Install-Recommends "false";'
-    owner=root
+  apt:
+    state: present
+    name: [
+      'bash-completion',
+      'ca-certificates',
+      'curl',
+      'debconf-utils',
+      'etckeeper',
+      'git',
+      'htop',
+      'less',
+      'lsb-base',
+      'lsb-release',
+      'psmisc',
+      'net-tools',
+      'screen',
+      'sudo',
+      'telnet-ssl',
+      'vim',
+    ]
 
-- name: update APT repositories (when outdated)
+- name: install common packages (non Proxmox-VE hosts)
   tags:
-    - apt
     - packages
   apt: >
-    update_cache=yes
-    cache_valid_time=3600
+    state=present
+    name=busybox-static
+  when: "ansible_kernel.find('pve') < 1"
 
-- name: configure debconf(1) frontend
+- name: install Linux kernel packages (amd64; non Proxmox-VE hosts, non OpenVZ guest)
   tags:
-    - debconf
     - packages
-  debconf: >
-    name=debconf
-    question=debconf/frontend
-    value=Dialog
-    vtype=select
-
-- name: configure debconf(1) priority
-  tags:
-    - debconf
-    - packages
-  debconf: >
-    name=debconf
-    question=debconf/priority
-    value=low
-    vtype=select
+  apt: >
+    state=present
+    name=linux-image-amd64
+  when: "ansible_architecture == 'x86_64' and ansible_kernel.find('pve') < 1 and ansible_virtualization_type != 'openvz'"
 
-- name: install common packages
+- name: install Linux kernel packages (i386; non Proxmox-VE hosts, non OpenVZ guest)
   tags:
     - packages
   apt: >
-    state=installed
-    name={{ item }}
-  with_items:
-    - bash-completion
-    - busybox-static
-    - ca-certificates
-    - curl
-    - debconf-utils
-    - etckeeper
-    - git
-    - htop
-    - less
-    - linux-image-amd64
-    - lsb-base
-    - lsb-release
-    - psmisc
-    - net-tools
-    - screen
-    - sudo
-    - telnet-ssl
-    - vim
+    state=present
+    name=linux-image-686-pae
+  when: "ansible_architecture == 'i386' and ansible_kernel.find('pve') < 1 and ansible_virtualization_type != 'openvz'"