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

@@ -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

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

ci/packer/vagrant_img/provisioners/playbooks/upgrade_os.yml → 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

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