Merge branch 'dev'

[perso/Immae/Projets/Puppet.git] / scripts / arch_install_script.sh

diff --git a/scripts/arch_install_script.sh b/scripts/arch_install_script.sh
index 21e202f35af8452cd3b1bb264dd478a31c902e6c..3f99ec997ba516e9025253773c4deb61f275a795 100755 (executable)
--- a/scripts/arch_install_script.sh
+++ b/scripts/arch_install_script.sh
@@ -6,8 +6,15 @@ 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 --environment $environment --tags base_installation --test $CODE_PATH/manifests/site.pp
+pacman-key --init
+pacman-key --populate archlinux
+
+git clone -b $git_branch https://git.immae.eu/perso/Immae/Projets/Puppet.git $CODE_PATH
+cd $CODE_PATH
+git submodule update --init
+
+export FACTER_in_chroot="yes"
+puppet apply --environment $environment --tags base_installation --modulepath $CODE_PATH/modules:$CODE_PATH/external_modules --test $CODE_PATH/manifests/site.pp
 # The password seed requires puppet to be run twice
-puppet apply --environment $environment --tags base_installation --test $CODE_PATH/manifests/site.pp
+puppet apply --environment $environment --tags base_installation --modulepath $CODE_PATH/modules:$CODE_PATH/external_modules --test $CODE_PATH/manifests/site.pp