From 29fb8f9420138d2ce31513fb6ea2e90626f1c124 Mon Sep 17 00:00:00 2001
From: "Andreas B. Mundt" <andi@debian.org>
Date: Tue, 21 Jan 2020 20:50:18 +0100
Subject: [PATCH] Move extra_pkgs*-handling to the up2date-debian role.

---
 roles/kiosk/tasks/main.yml             | 14 --------------
 roles/lan-client/tasks/main.yml        | 14 --------------
 roles/up2date-debian/defaults/main.yml |  2 ++
 roles/up2date-debian/tasks/main.yml    | 20 ++++++++++++++++++++
 4 files changed, 22 insertions(+), 28 deletions(-)
 create mode 100644 roles/up2date-debian/defaults/main.yml

diff --git a/roles/kiosk/tasks/main.yml b/roles/kiosk/tasks/main.yml
index 93aaea8..60ab55e 100644
--- a/roles/kiosk/tasks/main.yml
+++ b/roles/kiosk/tasks/main.yml
@@ -1,17 +1,3 @@
-- name: install extra packages from stable
-  apt: name={{ extra_pkgs }} state=latest
-
-- name: add {{ ansible_distribution_release }}-backports
-  apt_repository:
-    repo: deb http://deb.debian.org/debian/ {{ ansible_distribution_release }}-backports main
-    state: present
-    update_cache: yes
-  when: extra_pkgs_bpo|length
-
-- name: install extra packages from backports
-  apt: name={{ extra_pkgs_bpo }} state=latest default_release={{ ansible_distribution_release }}-backports
-  when: extra_pkgs_bpo|length
-
 ## Check which display manager is used:
 - name: check if gdm3 is installed
   stat: path=/etc/gdm3/daemon.conf
diff --git a/roles/lan-client/tasks/main.yml b/roles/lan-client/tasks/main.yml
index 24bfacc..9b793a3 100644
--- a/roles/lan-client/tasks/main.yml
+++ b/roles/lan-client/tasks/main.yml
@@ -52,20 +52,6 @@
 
 ## oddjob-mkhomedir works only with sec=sys for the NFSv4 share
 
-- name: install extra packages from stable
-  apt: name={{ extra_pkgs }} state=latest
-
-- name: add {{ ansible_distribution_release }}-backports
-  apt_repository:
-    repo: deb http://deb.debian.org/debian/ {{ ansible_distribution_release }}-backports main
-    state: present
-    update_cache: yes
-  when: extra_pkgs_bpo|length
-
-- name: install extra packages from backports
-  apt: name={{ extra_pkgs_bpo }} state=latest default_release={{ ansible_distribution_release }}-backports
-  when: extra_pkgs_bpo|length
-
 - name: provide identities from directory
   template:
     src: sssd.conf.j2
diff --git a/roles/up2date-debian/defaults/main.yml b/roles/up2date-debian/defaults/main.yml
new file mode 100644
index 0000000..97d8c9b
--- /dev/null
+++ b/roles/up2date-debian/defaults/main.yml
@@ -0,0 +1,2 @@
+extra_pkgs: ""
+extra_pkgs_bpo: ""
diff --git a/roles/up2date-debian/tasks/main.yml b/roles/up2date-debian/tasks/main.yml
index 8cb8dcc..cd11949 100644
--- a/roles/up2date-debian/tasks/main.yml
+++ b/roles/up2date-debian/tasks/main.yml
@@ -15,3 +15,23 @@
   apt:
     name: etckeeper
     state: latest
+
+- name: install extra packages from stable
+  apt:
+    name: "{{ extra_pkgs }}"
+    state: latest
+  when: extra_pkgs|length
+
+- name: add {{ ansible_distribution_release }}-backports
+  apt_repository:
+    repo: deb http://deb.debian.org/debian/ {{ ansible_distribution_release }}-backports main
+    state: present
+    update_cache: yes
+  when: extra_pkgs_bpo|length
+
+- name: install extra packages from backports
+  apt:
+    name: "{{ extra_pkgs_bpo }}"
+    state: latest
+    default_release: "{{ ansible_distribution_release }}-backports"
+  when: extra_pkgs_bpo|length