diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-03-19 18:44:43 +0100 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-03-19 18:44:43 +0100 |
commit | b45f55437f8239acf5576f4f5282b68eb933db32 (patch) | |
tree | fed6ee53cdc606dbbb488b37120b8c98a0aaa1d7 | |
parent | f25ad097f24e0d39d5dd9ac2cef39760e671e08f (diff) | |
download | Puppet-b45f55437f8239acf5576f4f5282b68eb933db32.tar.gz Puppet-b45f55437f8239acf5576f4f5282b68eb933db32.tar.zst Puppet-b45f55437f8239acf5576f4f5282b68eb933db32.zip |
Other fixes
3 files changed, 4 insertions, 2 deletions
diff --git a/modules/base_installation/manifests/cronie.pp b/modules/base_installation/manifests/cronie.pp index e8f3e20..2235470 100644 --- a/modules/base_installation/manifests/cronie.pp +++ b/modules/base_installation/manifests/cronie.pp | |||
@@ -19,13 +19,13 @@ class base_installation::cronie inherits base_installation { | |||
19 | } | 19 | } |
20 | cron { 'puppet-apply': | 20 | cron { 'puppet-apply': |
21 | ensure => present, | 21 | ensure => present, |
22 | command => "cd $base_installation::puppet_code_path ; puppet_apply $base_installation::puppet_code_path/manifests/site.pp", | 22 | command => "cd $base_installation::puppet_code_path ; /usr/local/sbin/puppet_apply $base_installation::puppet_code_path/manifests/site.pp", |
23 | user => root, | 23 | user => root, |
24 | minute => '*/20' | 24 | minute => '*/20' |
25 | } | 25 | } |
26 | cron { 'puppet-apply-reboot': | 26 | cron { 'puppet-apply-reboot': |
27 | ensure => present, | 27 | ensure => present, |
28 | command => "cd $base_installation::puppet_code_path ; puppet_apply $base_installation::puppet_code_path/manifests/site.pp", | 28 | command => "cd $base_installation::puppet_code_path ; /usr/local/sbin/puppet_apply $base_installation::puppet_code_path/manifests/site.pp", |
29 | user => root, | 29 | user => root, |
30 | special => "reboot" | 30 | special => "reboot" |
31 | } | 31 | } |
diff --git a/scripts/ovh_cloud_instance/arch_host_puppet_configuration_script.sh b/scripts/ovh_cloud_instance/arch_host_puppet_configuration_script.sh index b58e255..6aae8a7 100755 --- a/scripts/ovh_cloud_instance/arch_host_puppet_configuration_script.sh +++ b/scripts/ovh_cloud_instance/arch_host_puppet_configuration_script.sh | |||
@@ -9,3 +9,4 @@ sudo cp /tmp/arch_puppet_configuration_script.sh "$MOUNTPOINT/root/" | |||
9 | 9 | ||
10 | sudo arch-chroot "$MOUNTPOINT" /root/arch_puppet_configuration_script.sh "$git_branch" "$environment" | 10 | sudo arch-chroot "$MOUNTPOINT" /root/arch_puppet_configuration_script.sh "$git_branch" "$environment" |
11 | 11 | ||
12 | sudo umount "$MOUNTPOINT" | ||
diff --git a/scripts/ovh_vps_ssd/arch_host_puppet_configuration_script.sh b/scripts/ovh_vps_ssd/arch_host_puppet_configuration_script.sh index dab8fac..35f46fd 100755 --- a/scripts/ovh_vps_ssd/arch_host_puppet_configuration_script.sh +++ b/scripts/ovh_vps_ssd/arch_host_puppet_configuration_script.sh | |||
@@ -11,3 +11,4 @@ cp /tmp/arch_puppet_configuration_script.sh "$MOUNTPOINT/root/" | |||
11 | 11 | ||
12 | /tmp/root.x86_64/bin/arch-chroot "$MOUNTPOINT" /root/arch_puppet_configuration_script.sh "$git_branch" "$environment" | 12 | /tmp/root.x86_64/bin/arch-chroot "$MOUNTPOINT" /root/arch_puppet_configuration_script.sh "$git_branch" "$environment" |
13 | 13 | ||
14 | umount "$MOUNTPOINT" | ||