diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-04-28 17:28:55 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-04-28 17:28:55 +0200 |
commit | 65a3209bbb025138fe0b3f422d54604d63480b61 (patch) | |
tree | 36de0c51dc44ec4d9652b2842200ac688705270f /scripts/arch_install_script.sh | |
parent | 59e6672eaacaa29a5f5372c39dcd6a2fd9078e46 (diff) | |
parent | d7b6e53e01c414582f0ff4cdc07dc963838b5192 (diff) | |
download | Puppet-65a3209bbb025138fe0b3f422d54604d63480b61.tar.gz Puppet-65a3209bbb025138fe0b3f422d54604d63480b61.tar.zst Puppet-65a3209bbb025138fe0b3f422d54604d63480b61.zip |
Merge branch 'dev'
Diffstat (limited to 'scripts/arch_install_script.sh')
-rwxr-xr-x | scripts/arch_install_script.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/arch_install_script.sh b/scripts/arch_install_script.sh index a16b796..2d0d695 100755 --- a/scripts/arch_install_script.sh +++ b/scripts/arch_install_script.sh | |||
@@ -12,7 +12,7 @@ pacman-key --populate archlinux | |||
12 | git clone -b $git_branch --recursive https://git.immae.eu/perso/Immae/Projets/Puppet.git $CODE_PATH | 12 | git clone -b $git_branch --recursive https://git.immae.eu/perso/Immae/Projets/Puppet.git $CODE_PATH |
13 | 13 | ||
14 | export FACTER_in_chroot="yes" | 14 | export FACTER_in_chroot="yes" |
15 | puppet apply --environment $environment --tags base_installation --test $CODE_PATH/manifests/site.pp | 15 | puppet apply --environment $environment --tags base_installation --modulepath $CODE_PATH/modules:$CODE_PATH/external_modules --test $CODE_PATH/manifests/site.pp |
16 | # The password seed requires puppet to be run twice | 16 | # The password seed requires puppet to be run twice |
17 | puppet apply --environment $environment --tags base_installation --test $CODE_PATH/manifests/site.pp | 17 | puppet apply --environment $environment --tags base_installation --modulepath $CODE_PATH/modules:$CODE_PATH/external_modules --test $CODE_PATH/manifests/site.pp |
18 | 18 | ||