Merge branch 'master' of git.thengo.net:ka/ansible-role-common

defaults/main.yaml

@@ -30,6 +30,9 @@ debian_backports_sources: "{{debian_sources}}"
 debian_security_sources: "{{debian_sources}}"
 
 common_package_intallation: true
+machine_package_intallation: true
 microcode_update: false
 
-increase_maximum_inotify_user_watches: true
+increase_maximum_inotify_user_watches: false
+
+resolvconf_enabled: true

tasks/debian_packages.yaml

@@ -9,6 +9,11 @@
     pkg: "{{ debian_boot_packages }}"
   when: debian_boot_packages is defined
 
+- name: debian machine packages
+  apt:
+    pkg: "{{ debian_machine_packages }}"
+  when: machine_package_intallation
+
 - name: debian common packages
   apt:
     pkg: "{{ debian_common_packages }}"

tasks/network.yaml

@@ -1,8 +1,15 @@
 ---
 
-- name: link resolv.conf
-  file:
-    src: /run/resolvconf/resolv.conf
-    dest: /etc/resolv.conf
-    state: link
-    force: true
+- when: resolvconf_enabled
+  block:
+
+  - name: resolvconf debian package
+    apt:
+      pkg: resolvconf
+
+  - name: link resolv.conf
+    file:
+      src: /run/resolvconf/resolv.conf
+      dest: /etc/resolv.conf
+      state: link
+      force: true

vars/main.yaml

@@ -11,11 +11,9 @@ debian_base_packages:
   - nano
 
   # network tools
+  - net-tools
   - iputils-ping
 
-  # network config
-  - resolvconf
-
   # compression
   - unzip
   - p7zip
@@ -110,7 +108,7 @@ debian_common_packages:
   # installation utils
   - debootstrap
 
-debian_hardware_packages:
+debian_machine_packages:
 
   # hardware utils
   - pciutils