diff options
| author | James Shubin <james@shubin.ca> | 2013-10-26 01:19:29 -0400 |
|---|---|---|
| committer | James Shubin <james@shubin.ca> | 2013-10-26 01:42:22 -0400 |
| commit | e71fb3b68d7d7cebc7d0f9f03a38c3ae7f2a2a80 (patch) | |
| tree | 80fe7bffaa25e89a9a24bca277a792d9eecd9b22 /manifests | |
| parent | db0e06f48d09f94f92fb78087a717b79c9da6eac (diff) | |
| download | puppet-gluster-e71fb3b68d7d7cebc7d0f9f03a38c3ae7f2a2a80.tar.gz puppet-gluster-e71fb3b68d7d7cebc7d0f9f03a38c3ae7f2a2a80.tar.xz puppet-gluster-e71fb3b68d7d7cebc7d0f9f03a38c3ae7f2a2a80.zip | |
Small fixes for gluster::simple.
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/simple.pp | 5 | ||||
| -rw-r--r-- | manifests/volume.pp | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/manifests/simple.pp b/manifests/simple.pp index 4f34cb9..edd80ac 100644 --- a/manifests/simple.pp +++ b/manifests/simple.pp @@ -20,7 +20,8 @@ class gluster::simple( $volume = 'puppet', # NOTE: this can be a list... $replica = 1, $stripe = 1, # TODO: not fully implemented in puppet-gluster - $vip = '' # strongly recommended + $vip = '', # strongly recommended + $shorewall = true ) { include gluster::vardir @@ -58,7 +59,7 @@ class gluster::simple( class { '::gluster::server': vip => "${vip}", #zone => 'net', # defaults to net - shorewall => true, + shorewall => $shorewall, } @@gluster::host { "${::fqdn}": diff --git a/manifests/volume.pp b/manifests/volume.pp index 5e8b7e1..d16db55 100644 --- a/manifests/volume.pp +++ b/manifests/volume.pp @@ -71,7 +71,8 @@ define gluster::volume( } } - $collected_bricks = split(getvar("gluster_brick_group_${group}"), ',') + $gluster_brick_group_fact = getvar("gluster_brick_group_${group}") + $collected_bricks = split($gluster_brick_group_fact, ',') $valid_bricks = type($bricks) ? { 'boolean' => $bricks ? { true => $collected_bricks, # an array... @@ -318,6 +319,7 @@ define gluster::volume( source => "${zone}", # use our source zone before => Service['glusterd'], } + } # fsm variables and boilerplate $statefile = "${vardir}/volume/fsm/${name}/state" |