diff options
| author | James Shubin <james@shubin.ca> | 2014-04-10 16:40:08 -0400 |
|---|---|---|
| committer | James Shubin <james@shubin.ca> | 2014-04-10 17:22:17 -0400 |
| commit | b5e83426b9d0af4abff241670bf5a68fdfc265fb (patch) | |
| tree | a95a0f6247e5d8031c596c2ba0347390acdd2c78 /manifests/brick.pp | |
| parent | c1e6e037316d9e6b2027f2051d8dfe1102b1b3d1 (diff) | |
| download | puppet-gluster-b5e83426b9d0af4abff241670bf5a68fdfc265fb.tar.gz puppet-gluster-b5e83426b9d0af4abff241670bf5a68fdfc265fb.tar.xz puppet-gluster-b5e83426b9d0af4abff241670bf5a68fdfc265fb.zip | |
Make Exec['again'] optional. As a result puppet-common is optional.
Although if you remove all the features, it's not as awesome anymore :)
Diffstat (limited to 'manifests/brick.pp')
| -rw-r--r-- | manifests/brick.pp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/manifests/brick.pp b/manifests/brick.pp index 2fb3cae..b4c69c5 100644 --- a/manifests/brick.pp +++ b/manifests/brick.pp @@ -36,10 +36,13 @@ define gluster::brick( $xfs_nobarrier = false, $force = false, # if true, this will overwrite any xfs fs it sees, useful for rebuilding gluster and wiping data. NOTE: there are other safeties in place to stop this. $areyousure = false, # do you allow puppet to do dangerous things ? + $again = true, # do we want to use Exec['again'] ? $comment = '' ) { include gluster::brick::base - include gluster::again + if $again { + include gluster::again + } include gluster::vardir #$vardir = $::gluster::vardir::module_vardir # with trailing slash @@ -405,7 +408,10 @@ define gluster::brick( command => '/bin/true', # do nothing but notify logoutput => on_failure, onlyif => "/usr/bin/test -z '${valid_fsuuid}'", - notify => Common::Again::Delta['gluster-exec-again'], + notify => $again ? { + false => undef, + default => Common::Again::Delta['gluster-exec-again'], + }, # this (optional) require makes it more logical require => File["${vardir}/brick/fsuuid/"], } |