From bff8fcfebb30b5d6a81881c657f237d2cf2a0ea3 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Tue, 25 Jan 2022 18:25:47 +0100
Subject: [PATCH] apt: upgrade packages after all the configuration is done

---
 CHANGELOG.md                 |  3 ++-
 apt/tasks/config.yml         | 14 --------------
 apt/tasks/main.yml           | 14 ++++++++++++++
 evolinux-base/tasks/main.yml |  1 +
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e83c3248..95d42c81 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,7 @@ The **patch** part changes is incremented if multiple releases happen the same m
 * etc-git: centralize cron jobs in dedicated crontab
 * etc-git: manage commits with an optimized shell script instead of many slow Ansible tasks
 * evolinux-base: add script backup-server-state
+* evolinux-base: configure top and htop to display the swap column
 * evolinux-base: install molly-guard by default
 * generate-ldif: detect RAID controller
 * generate-ldif: detect mdadm
@@ -58,6 +59,7 @@ The **patch** part changes is incremented if multiple releases happen the same m
 * Install python 2 or 3 libraries according to running python version
 * Remove embedded GPG keys only if legacy keyring is present
 * apt: remove workaround for Evolix public repositories with Debian 11
+* apt: upgrade packages after all the configuration is done
 * apt: use the new security repository for Bullseye
 * certbot: silence letsencrypt deprecation warnings
 * elasticsearch: elastic_stack_version = 7.x
@@ -110,7 +112,6 @@ The **patch** part changes is incremented if multiple releases happen the same m
 * Add Elastic GPG key to kibana, filebeat, logstash, metricbeat roles
 * apache: new variable for mpm mode (+ updated default config accordingly)
 * evolinux-base: add default motd template
-* evolinux-base: configure top and htop to display the swap column
 * kvm-host: add migrate-vm script
 * mysql: variable to disable myadd script overwrite (default: True)
 * nodejs: update apt cache before installing the package
diff --git a/apt/tasks/config.yml b/apt/tasks/config.yml
index 4d7372fc..7befa375 100644
--- a/apt/tasks/config.yml
+++ b/apt/tasks/config.yml
@@ -39,17 +39,3 @@
   when: apt_remove_aptitude | bool
   tags:
     - apt
-
-- name: Updating APT cache
-  apt:
-    update_cache: yes
-  changed_when: False
-  tags:
-    - apt
-
-- name: Upgrading system
-  apt:
-    upgrade: dist
-  when: apt_upgrade | bool
-  tags:
-    - apt
diff --git a/apt/tasks/main.yml b/apt/tasks/main.yml
index 118f8ef9..353dca36 100644
--- a/apt/tasks/main.yml
+++ b/apt/tasks/main.yml
@@ -37,3 +37,17 @@
   when: apt_install_hold_packages | bool
   tags:
     - apt
+
+- name: Updating APT cache
+  apt:
+    update_cache: yes
+  changed_when: False
+  tags:
+    - apt
+
+- name: Upgrading system
+  apt:
+    upgrade: dist
+  when: apt_upgrade | bool
+  tags:
+    - apt
\ No newline at end of file
diff --git a/evolinux-base/tasks/main.yml b/evolinux-base/tasks/main.yml
index bc11c030..5a0532a3 100644
--- a/evolinux-base/tasks/main.yml
+++ b/evolinux-base/tasks/main.yml
@@ -13,6 +13,7 @@
   vars:
     apt_install_basics: "{{ evolinux_apt_replace_default_sources }}"
     apt_install_evolix_public: "{{ evolinux_apt_public_sources }}"
+    apt_upgrade: "{{ evolinux_apt_upgrade }}"
   when: evolinux_apt_include | bool
 
 - name: /etc versioning with Git