summaryrefslogtreecommitdiffstats
path: root/manifests/simple.pp
diff options
context:
space:
mode:
authorJames Shubin <james@shubin.ca>2014-03-12 11:34:52 -0400
committerJames Shubin <james@shubin.ca>2014-03-16 22:39:08 -0400
commit05576cd410bb2616ce72e3e9e24850f911cbb6dc (patch)
tree0286fce76ac26f8aa74caf96c04cc70f180f6101 /manifests/simple.pp
parentfbe9e9cb4bd8cc4278eba8e16bc69f009f334d7a (diff)
downloadpuppet-gluster-05576cd410bb2616ce72e3e9e24850f911cbb6dc.tar.gz
puppet-gluster-05576cd410bb2616ce72e3e9e24850f911cbb6dc.tar.xz
puppet-gluster-05576cd410bb2616ce72e3e9e24850f911cbb6dc.zip
Setting volume properties should be race-free.
This isn't essential, as ensuring this is race-free is really up to glusterfs, but with this patch you reduce the likelihood to ~0% that you'll see a: "volume set: failed: Another transaction is in progress." error. The error isn't harmful, but now we'll see less unnecessary red.
Diffstat (limited to 'manifests/simple.pp')
-rw-r--r--manifests/simple.pp3
1 files changed, 2 insertions, 1 deletions
diff --git a/manifests/simple.pp b/manifests/simple.pp
index 0fa75da..6bc6c11 100644
--- a/manifests/simple.pp
+++ b/manifests/simple.pp
@@ -176,7 +176,8 @@ class gluster::simple(
if "${setgroup}" != '' {
$setgroup_yaml = inline_template("<%= @valid_volumes.inject(Hash.new) { |h,i| {i+'#'+@setgroup => {}}.merge(h) }.to_yaml %>")
$setgroup_hash = parseyaml($setgroup_yaml)
- create_resources('gluster::volume::property::group', $setgroup_hash)
+ $setgroup_defaults = {'vip' => "${vip}"}
+ create_resources('gluster::volume::property::group', $setgroup_hash, $setgroup_defaults)
}
}