aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbin/install_script.sh6
-rw-r--r--modules/base_installation/manifests/cronie.pp6
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
173CODE_PATH="/etc/puppetlabs/code" 173CODE_PATH="/etc/puppetlabs/code"
174rm -rf \$CODE_PATH 174rm -rf \$CODE_PATH
175git clone -b $git_branch --recursive https://git.immae.eu/perso/Immae/Projets/Puppet.git \$CODE_PATH 175git clone -b $git_branch --recursive https://git.immae.eu/perso/Immae/Projets/Puppet.git \$CODE_PATH
176puppet apply --test \$CODE_PATH/manifests/site.pp 176puppet apply --tags base_installation --test \$CODE_PATH/manifests/site.pp
177# The password seed requires puppet to be run twice 177# The password seed requires puppet to be run twice
178puppet apply --test \$CODE_PATH/manifests/site.pp 178puppet apply --tags base_installation --test \$CODE_PATH/manifests/site.pp
179EOF 179EOF
180 180
181chmod a+x $ARCH_HOST_SCRIPT $ARCH_CHROOT_SCRIPT $ARCH_INSTALL_SCRIPT 181chmod a+x $ARCH_HOST_SCRIPT $ARCH_CHROOT_SCRIPT $ARCH_INSTALL_SCRIPT
@@ -197,7 +197,7 @@ read -p "Press key when LDAP is configured" i
197 197
198cat > $ARCH_PUPPET_CONFIGURATION_SCRIPT <<EOF 198cat > $ARCH_PUPPET_CONFIGURATION_SCRIPT <<EOF
199CODE_PATH="/etc/puppetlabs/code" 199CODE_PATH="/etc/puppetlabs/code"
200puppet apply --test \$CODE_PATH/manifests/site.pp 200puppet apply --tags base_installation --test \$CODE_PATH/manifests/site.pp
201EOF 201EOF
202 202
203cat > $ARCH_HOST_PUPPET_CONFIGURATION_SCRIPT <<EOF 203cat > $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 {
23 user => root, 23 user => root,
24 minute => '*/20' 24 minute => '*/20'
25 } 25 }
26 cron { 'puppet-apply-reboot':
27 ensure => present,
28 command => "cd $base_installation::puppet_code_path ; puppet apply --test $base_installation::puppet_code_path/manifests/site.pp",
29 user => root,
30 special => "reboot"
31 }
26 } 32 }
27} 33}