From b45f55437f8239acf5576f4f5282b68eb933db32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Mon, 19 Mar 2018 18:44:43 +0100 Subject: Other fixes --- modules/base_installation/manifests/cronie.pp | 4 ++-- scripts/ovh_cloud_instance/arch_host_puppet_configuration_script.sh | 1 + scripts/ovh_vps_ssd/arch_host_puppet_configuration_script.sh | 1 + 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 { } 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 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/" 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 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/" /tmp/root.x86_64/bin/arch-chroot "$MOUNTPOINT" /root/arch_puppet_configuration_script.sh "$git_branch" "$environment" +umount "$MOUNTPOINT" -- cgit v1.2.3