From 428fcf14be3943fc01d234a5e622c7f8706bcb73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Sun, 18 Feb 2018 22:54:05 +0100
Subject: Make puppet apply non-critical part at reboot

---
 bin/install_script.sh                         | 6 +++---
 modules/base_installation/manifests/cronie.pp | 6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/bin/install_script.sh b/bin/install_script.sh
index d9d3808..49a737f 100755
--- a/bin/install_script.sh
+++ b/bin/install_script.sh
@@ -173,9 +173,9 @@ cat > $ARCH_INSTALL_SCRIPT <<EOF
 CODE_PATH="/etc/puppetlabs/code"
 rm -rf \$CODE_PATH
 git clone -b $git_branch --recursive https://git.immae.eu/perso/Immae/Projets/Puppet.git \$CODE_PATH
-puppet apply --test \$CODE_PATH/manifests/site.pp
+puppet apply --tags base_installation --test \$CODE_PATH/manifests/site.pp
 # The password seed requires puppet to be run twice
-puppet apply --test \$CODE_PATH/manifests/site.pp
+puppet apply --tags base_installation --test \$CODE_PATH/manifests/site.pp
 EOF
 
 chmod a+x $ARCH_HOST_SCRIPT $ARCH_CHROOT_SCRIPT $ARCH_INSTALL_SCRIPT
@@ -197,7 +197,7 @@ read -p "Press key when LDAP is configured" i
 
 cat > $ARCH_PUPPET_CONFIGURATION_SCRIPT <<EOF
 CODE_PATH="/etc/puppetlabs/code"
-puppet apply --test \$CODE_PATH/manifests/site.pp
+puppet apply --tags base_installation --test \$CODE_PATH/manifests/site.pp
 EOF
 
 cat > $ARCH_HOST_PUPPET_CONFIGURATION_SCRIPT <<EOF
diff --git a/modules/base_installation/manifests/cronie.pp b/modules/base_installation/manifests/cronie.pp
index 918bce3..4df0e37 100644
--- a/modules/base_installation/manifests/cronie.pp
+++ b/modules/base_installation/manifests/cronie.pp
@@ -23,5 +23,11 @@ class base_installation::cronie inherits base_installation {
       user    => root,
       minute  => '*/20'
     }
+    cron { 'puppet-apply-reboot':
+      ensure  => present,
+      command => "cd $base_installation::puppet_code_path ; puppet apply --test $base_installation::puppet_code_path/manifests/site.pp",
+      user    => root,
+      special => "reboot"
+    }
   }
 }
-- 
cgit v1.2.3