aboutsummaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2018-02-18 22:54:05 +0100
committerIsmaël Bouya <ismael.bouya@normalesup.org>2018-02-18 22:54:05 +0100
commit428fcf14be3943fc01d234a5e622c7f8706bcb73 (patch)
treed144b72d85d60ec8490687cdf6f3a037d9622f88 /bin
parentaea8c51549e56f6d0ced3072fae9d61b6a87e6e4 (diff)
downloadPuppet-428fcf14be3943fc01d234a5e622c7f8706bcb73.tar.gz
Puppet-428fcf14be3943fc01d234a5e622c7f8706bcb73.tar.zst
Puppet-428fcf14be3943fc01d234a5e622c7f8706bcb73.zip
Make puppet apply non-critical part at reboot
Diffstat (limited to 'bin')
-rwxr-xr-xbin/install_script.sh6
1 files changed, 3 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