From 17ddda8ed3c86d72d162e4d9ccea27caaff06f25 Mon Sep 17 00:00:00 2001 From: Victor LABORIE Date: Tue, 31 Oct 2017 15:50:25 +0100 Subject: [PATCH] apt: use conditionnal instead of handler for update --- apt/handlers/main.yml | 4 ---- apt/tasks/backports.yml | 10 ++++++---- apt/tasks/basics.yml | 8 +++++--- apt/tasks/evolix_public.yml | 8 +++++--- 4 files changed, 16 insertions(+), 14 deletions(-) delete mode 100644 apt/handlers/main.yml diff --git a/apt/handlers/main.yml b/apt/handlers/main.yml deleted file mode 100644 index e68f5c28..00000000 --- a/apt/handlers/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- name: apt update - apt: - update_cache: yes diff --git a/apt/tasks/backports.yml b/apt/tasks/backports.yml index fd459a34..67b193d4 100644 --- a/apt/tasks/backports.yml +++ b/apt/tasks/backports.yml @@ -13,7 +13,7 @@ dest: /etc/apt/sources.list.d/backports.list force: yes mode: "0640" - notify: apt update + register: apt_backports_list tags: - apt @@ -23,11 +23,13 @@ dest: /etc/apt/preferences.d/0-backports-defaults force: yes mode: "0640" - notify: apt update + register: apt_backports_config tags: - apt -- name: Intermediate flush of handlers - meta: flush_handlers +- name: Apt update + apt: + update_cache: yes + when: apt_backports_list | changed or apt_backports_config | changed tags: - apt diff --git a/apt/tasks/basics.yml b/apt/tasks/basics.yml index d68e6063..f615c030 100644 --- a/apt/tasks/basics.yml +++ b/apt/tasks/basics.yml @@ -6,7 +6,7 @@ dest: /etc/apt/sources.list mode: "0644" force: yes - notify: apt update + register: apt_basic_list tags: - apt @@ -20,7 +20,9 @@ - /etc/apt/sources.list.d/debian-update.list when: apt_clean_gandi_sourceslist -- name: Intermediate flush of handlers - meta: flush_handlers +- name: Apt update + apt: + update_cache: yes + when: apt_basic_list | changed tags: - apt diff --git a/apt/tasks/evolix_public.yml b/apt/tasks/evolix_public.yml index 5bfb3287..b1db38ab 100644 --- a/apt/tasks/evolix_public.yml +++ b/apt/tasks/evolix_public.yml @@ -19,11 +19,13 @@ dest: /etc/apt/sources.list.d/evolix_public.list force: yes mode: "0640" - notify: apt update + register: apt_evolix_public tags: - apt -- name: Intermediate flush of handlers - meta: flush_handlers +- name: Apt update + apt: + update_cache: yes + when: apt_evolix_public | changed tags: - apt