Other fixes

diff --git a/modules/base_installation/manifests/cronie.pp b/modules/base_installation/manifests/cronie.pp
index e8f3e20eb456d8d87257812879d4f07897f02796..2235470b6a2c93d122822b824b5f6f5e3f991e5d 100644 (file)
--- 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 {
     }
     cron { 'puppet-apply':
       ensure  => present,
-      command => "cd $base_installation::puppet_code_path ; puppet_apply $base_installation::puppet_code_path/manifests/site.pp",
+      command => "cd $base_installation::puppet_code_path ; /usr/local/sbin/puppet_apply $base_installation::puppet_code_path/manifests/site.pp",
       user    => root,
       minute  => '*/20'
     }
     cron { 'puppet-apply-reboot':
       ensure  => present,
-      command => "cd $base_installation::puppet_code_path ; puppet_apply $base_installation::puppet_code_path/manifests/site.pp",
+      command => "cd $base_installation::puppet_code_path ; /usr/local/sbin/puppet_apply $base_installation::puppet_code_path/manifests/site.pp",
       user    => root,
       special => "reboot"
     }

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 b58e2551b48adef4cfb296c67c567a8323922641..6aae8a796324050e836648283229e6d4d0a96f93 100755 (executable)
--- 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/"
 
 sudo arch-chroot "$MOUNTPOINT" /root/arch_puppet_configuration_script.sh "$git_branch" "$environment"
 
+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 dab8fac32bb039277774e23e592205cc1e511566..35f46fd2d02ed56cb5a0568539051489b5d17331 100755 (executable)
--- 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/"
 
 /tmp/root.x86_64/bin/arch-chroot "$MOUNTPOINT" /root/arch_puppet_configuration_script.sh "$git_branch" "$environment"
 
+umount "$MOUNTPOINT"