diff options
| author | James Shubin <james@shubin.ca> | 2013-09-06 08:36:47 -0400 |
|---|---|---|
| committer | James Shubin <james@shubin.ca> | 2013-09-06 08:36:47 -0400 |
| commit | 64aaaf3b0160ac50d22bbdd73725de53bab668a8 (patch) | |
| tree | 98c7e7006fce99ce8a5157d27895e1dc75ea9f1d /manifests | |
| parent | 89dd93ee8703eea4274ee08e43d16178f152423b (diff) | |
| download | puppet-gluster-64aaaf3b0160ac50d22bbdd73725de53bab668a8.tar.gz puppet-gluster-64aaaf3b0160ac50d22bbdd73725de53bab668a8.tar.xz puppet-gluster-64aaaf3b0160ac50d22bbdd73725de53bab668a8.zip | |
Small bugfixes.
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/server.pp | 2 | ||||
| -rw-r--r-- | manifests/volume.pp | 1 | ||||
| -rw-r--r-- | manifests/volume/property.pp | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/manifests/server.pp b/manifests/server.pp index 359a249..53d2161 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -25,6 +25,8 @@ class gluster::server( $zone = 'net', # TODO: allow a list of zones $allow = 'all' ) { + $FW = '$FW' # make using $FW in shorewall easier + # TODO: ensure these are from our 'gluster' repo package { 'glusterfs-server': ensure => present, diff --git a/manifests/volume.pp b/manifests/volume.pp index e9df9ac..22387f5 100644 --- a/manifests/volume.pp +++ b/manifests/volume.pp @@ -77,6 +77,7 @@ define gluster::volume( unless => "/usr/sbin/gluster volume list | /bin/grep -qxF '${name}' -", # add volume if it doesn't exist #before => TODO?, #require => Gluster::Brick[$bricks], + require => Service['glusterd'], alias => "gluster-volume-create-${name}", } } diff --git a/manifests/volume/property.pp b/manifests/volume/property.pp index 12fee73..7e0b6aa 100644 --- a/manifests/volume/property.pp +++ b/manifests/volume/property.pp @@ -65,9 +65,10 @@ define gluster::volume::property( } elsif $etype == 'array' { $jchar = $key ? { 'auth.allow' => ',', - 'auth.deny' => ',', + 'auth.reject' => ',', default => '', } + $safe_value = inline_template('<%= value.join(jchar) %>') #} elsif ... { # TODO: add more conversions here if needed |