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/simple.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/simple.pp')
| -rw-r--r-- | manifests/simple.pp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/manifests/simple.pp b/manifests/simple.pp index 8686263..1b72df3 100644 --- a/manifests/simple.pp +++ b/manifests/simple.pp @@ -32,6 +32,7 @@ class gluster::simple( $brick_params_defaults = [], # array of hashes to use as brick count $setgroup = '', # pick a volume property group to set, eg: virt $ping = true, # use fping or not? + $again = true, # do we want to use Exec['again'] ? $baseport = '', # specify base port option as used in glusterd.vol file $rpcauthallowinsecure = false, # needed in some setups in glusterd.vol $shorewall = true @@ -66,13 +67,10 @@ class gluster::simple( # if this is a hash, then it's used as the defaults for all the bricks! validate_hash($brick_param_defaults) - # in someone explicitly added this value, then don't overwrite it... - if has_key($brick_param_defaults, 'areyousure') { - $valid_brick_param_defaults = $brick_param_defaults - } else { - $areyousure = {areyousure => true} - $valid_brick_param_defaults = merge($brick_param_defaults, $areyousure) - } + # if someone explicitly added this value, then don't overwrite it... + $areyousure = {'areyousure' => true} + $againhash = {'again' => $again} # pass through the $again value + $valid_brick_param_defaults = merge($areyousure, $againhash, $brick_param_defaults) # if this is an array, then each element is the default for each brick! # if this is an array, then the number of elements is the brick count!! @@ -175,6 +173,7 @@ class gluster::simple( bricks => true, # automatic brick collection... ping => $ping, start => true, + again => $again, } Gluster::Volume <<||>> |