From 4261fd5b918a2c069843078951c4b2b58133e498 Mon Sep 17 00:00:00 2001
From: nqb <nqb+git@azyx.fr>
Date: Tue, 23 Feb 2021 13:59:48 +0100
Subject: [PATCH] Upgrade CentOS after build, upgrade Debian during build

Upgrade from 7.8 to 7.9 on CentOS cause issue after sysprep (non-bootable image)
---
 addons/vagrant/site.yml                        |  2 ++
 addons/vagrant/upgrade_centos_os.yml           | 18 ++++++++++++++++++
 .../{upgrade_os.yml => upgrade_debian_os.yml}  | 11 ++---------
 ci/packer/vagrant_img/provisioners/site.yml    |  2 +-
 4 files changed, 23 insertions(+), 10 deletions(-)
 create mode 100644 addons/vagrant/upgrade_centos_os.yml
 rename ci/packer/vagrant_img/provisioners/playbooks/{upgrade_os.yml => upgrade_debian_os.yml} (54%)

diff --git a/addons/vagrant/site.yml b/addons/vagrant/site.yml
index 06c0ee187106..90b4844d1efc 100644
--- a/addons/vagrant/site.yml
+++ b/addons/vagrant/site.yml
@@ -1,5 +1,7 @@
 ---
 # no sub directory for ansible playbooks to find roles under roles/ directory
+- import_playbook: upgrade_centos_os.yml
+
 - import_playbook: config_dev_repos.yml
 
 - import_playbook: install_pf.yml
diff --git a/addons/vagrant/upgrade_centos_os.yml b/addons/vagrant/upgrade_centos_os.yml
new file mode 100644
index 000000000000..18ef2ddcfaa6
--- /dev/null
+++ b/addons/vagrant/upgrade_centos_os.yml
@@ -0,0 +1,18 @@
+- hosts: pfservers
+  name: upgrade CentOS OS to latest version
+  become: True
+  gather_facts: True
+  tags: upgrade
+
+  tasks:
+    - name: update to latest OS version (EL)
+      yum:
+        name: '*'
+        state: latest
+        update_cache: yes
+      register: upgrade_os_el_register
+      when: ansible_os_family == 'RedHat'
+
+    - name: reboot to have latest Linux kernel packages in place when installing PacketFence
+      reboot:
+      when: upgrade_os_el_register is changed
diff --git a/ci/packer/vagrant_img/provisioners/playbooks/upgrade_os.yml b/ci/packer/vagrant_img/provisioners/playbooks/upgrade_debian_os.yml
similarity index 54%
rename from ci/packer/vagrant_img/provisioners/playbooks/upgrade_os.yml
rename to ci/packer/vagrant_img/provisioners/playbooks/upgrade_debian_os.yml
index d58260467d1b..d624c84138e6 100644
--- a/ci/packer/vagrant_img/provisioners/playbooks/upgrade_os.yml
+++ b/ci/packer/vagrant_img/provisioners/playbooks/upgrade_debian_os.yml
@@ -1,5 +1,5 @@
 - hosts: pfservers
-  name: upgrade OS to latest version
+  name: upgrade Debian OS to latest version
   become: True
   gather_facts: True
   tags: upgrade
@@ -13,14 +13,7 @@
       register: upgrade_os_deb_register
       when: ansible_os_family == 'Debian'
 
-    - name: update to latest OS version (EL)
-      yum:
-        name: '*'
-        state: latest
-        update_cache: yes
-      register: upgrade_os_el_register
-      when: ansible_os_family == 'RedHat'
 
     - name: reboot to have latest Linux kernel packages in place when installing PacketFence
       reboot:
-      when: (upgrade_os_deb_register is changed or upgrade_os_el_register is changed)
+      when: upgrade_os_deb_register is changed
diff --git a/ci/packer/vagrant_img/provisioners/site.yml b/ci/packer/vagrant_img/provisioners/site.yml
index e8df8011c583..03fef729f0f7 100644
--- a/ci/packer/vagrant_img/provisioners/site.yml
+++ b/ci/packer/vagrant_img/provisioners/site.yml
@@ -1,5 +1,5 @@
 ---
-- import_playbook: playbooks/upgrade_os.yml
+- import_playbook: playbooks/upgrade_debian_os.yml
 
 - import_playbook: playbooks/install_repos.yml