aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/base_installation/files/scripts/puppet_lock16
-rw-r--r--modules/base_installation/manifests/puppet.pp6
2 files changed, 22 insertions, 0 deletions
diff --git a/modules/base_installation/files/scripts/puppet_lock b/modules/base_installation/files/scripts/puppet_lock
new file mode 100644
index 0000000..cf5c429
--- /dev/null
+++ b/modules/base_installation/files/scripts/puppet_lock
@@ -0,0 +1,16 @@
1#!/bin/bash
2
3lockfile=/var/run/puppet-apply.lock
4path=`dirname $0`
5path=`cd $path/..; pwd`
6
7if [ $(id -u) -gt 0 ]; then
8 echo "You must be root to run this script." >&2
9 exit 2
10fi
11
12if [ "$1" = "off" ]; then
13 rm -f "$lockfile"
14else
15 touch "$lockfile"
16fi
diff --git a/modules/base_installation/manifests/puppet.pp b/modules/base_installation/manifests/puppet.pp
index c64ddfd..fa2db69 100644
--- a/modules/base_installation/manifests/puppet.pp
+++ b/modules/base_installation/manifests/puppet.pp
@@ -27,6 +27,12 @@ class base_installation::puppet (
27 } 27 }
28 ### 28 ###
29 29
30 file { '/usr/local/sbin/i_puppet_lock':
31 mode => "0755",
32 ensure => present,
33 source => "puppet:///modules/base_installation/scripts/puppet_lock"
34 }
35
30 file { '/usr/local/sbin/i_puppet_reset_and_apply': 36 file { '/usr/local/sbin/i_puppet_reset_and_apply':
31 mode => "0755", 37 mode => "0755",
32 ensure => present, 38 ensure => present,