diff options
-rwxr-xr-x | bin/install_script.sh | 6 | ||||
-rw-r--r-- | 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 | |||
173 | CODE_PATH="/etc/puppetlabs/code" | 173 | CODE_PATH="/etc/puppetlabs/code" |
174 | rm -rf \$CODE_PATH | 174 | rm -rf \$CODE_PATH |
175 | git clone -b $git_branch --recursive https://git.immae.eu/perso/Immae/Projets/Puppet.git \$CODE_PATH | 175 | git clone -b $git_branch --recursive https://git.immae.eu/perso/Immae/Projets/Puppet.git \$CODE_PATH |
176 | puppet apply --test \$CODE_PATH/manifests/site.pp | 176 | puppet 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 |
178 | puppet apply --test \$CODE_PATH/manifests/site.pp | 178 | puppet apply --tags base_installation --test \$CODE_PATH/manifests/site.pp |
179 | EOF | 179 | EOF |
180 | 180 | ||
181 | chmod a+x $ARCH_HOST_SCRIPT $ARCH_CHROOT_SCRIPT $ARCH_INSTALL_SCRIPT | 181 | 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 | |||
197 | 197 | ||
198 | cat > $ARCH_PUPPET_CONFIGURATION_SCRIPT <<EOF | 198 | cat > $ARCH_PUPPET_CONFIGURATION_SCRIPT <<EOF |
199 | CODE_PATH="/etc/puppetlabs/code" | 199 | CODE_PATH="/etc/puppetlabs/code" |
200 | puppet apply --test \$CODE_PATH/manifests/site.pp | 200 | puppet apply --tags base_installation --test \$CODE_PATH/manifests/site.pp |
201 | EOF | 201 | EOF |
202 | 202 | ||
203 | cat > $ARCH_HOST_PUPPET_CONFIGURATION_SCRIPT <<EOF | 203 | 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 { | |||
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 | } |