diff options
| author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-03-29 20:38:51 +0200 |
|---|---|---|
| committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-03-29 20:38:51 +0200 |
| commit | a91216239a8fac0e5b001d256eaa7afe9df81fb8 (patch) | |
| tree | 88be90caca8024f47e0b242e09547dbefeec76b0 /scripts | |
| parent | d0b53eefa581355d5ff4cbff723e36aaa20fe5d9 (diff) | |
| parent | 48f15fb381adfa2e75ffda099f54088edec9f7bb (diff) | |
| download | Puppet-a91216239a8fac0e5b001d256eaa7afe9df81fb8.tar.gz Puppet-a91216239a8fac0e5b001d256eaa7afe9df81fb8.tar.zst Puppet-a91216239a8fac0e5b001d256eaa7afe9df81fb8.zip | |
Merge branch 'dev'
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/arch_install_script.sh | 2 | ||||
| -rwxr-xr-x | scripts/arch_puppet_configuration_script.sh | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/scripts/arch_install_script.sh b/scripts/arch_install_script.sh index d2c6107..a16b796 100755 --- a/scripts/arch_install_script.sh +++ b/scripts/arch_install_script.sh | |||
| @@ -10,6 +10,8 @@ pacman-key --init | |||
| 10 | pacman-key --populate archlinux | 10 | pacman-key --populate archlinux |
| 11 | 11 | ||
| 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 | |||
| 14 | export FACTER_in_chroot="yes" | ||
| 13 | puppet apply --environment $environment --tags base_installation --test $CODE_PATH/manifests/site.pp | 15 | puppet apply --environment $environment --tags base_installation --test $CODE_PATH/manifests/site.pp |
| 14 | # The password seed requires puppet to be run twice | 16 | # The password seed requires puppet to be run twice |
| 15 | puppet apply --environment $environment --tags base_installation --test $CODE_PATH/manifests/site.pp | 17 | puppet apply --environment $environment --tags base_installation --test $CODE_PATH/manifests/site.pp |
diff --git a/scripts/arch_puppet_configuration_script.sh b/scripts/arch_puppet_configuration_script.sh index caf8987..4efb137 100755 --- a/scripts/arch_puppet_configuration_script.sh +++ b/scripts/arch_puppet_configuration_script.sh | |||
| @@ -4,5 +4,6 @@ git_branch="$1" | |||
| 4 | environment="$2" | 4 | environment="$2" |
| 5 | CODE_PATH="/etc/puppetlabs/code" | 5 | CODE_PATH="/etc/puppetlabs/code" |
| 6 | 6 | ||
| 7 | export FACTER_in_chroot="yes" | ||
| 7 | puppet apply --environment $environment --tags base_installation --test $CODE_PATH/manifests/site.pp | 8 | puppet apply --environment $environment --tags base_installation --test $CODE_PATH/manifests/site.pp |
| 8 | 9 | ||