diff options
| author | James Shubin <james@shubin.ca> | 2014-01-24 17:26:13 -0500 |
|---|---|---|
| committer | James Shubin <james@shubin.ca> | 2014-01-24 17:26:13 -0500 |
| commit | 221e3049f04fb608d013d7092bcfb258010b2d6d (patch) | |
| tree | a73bb21848e56dc58405d4a605eb1de8a76654eb | |
| parent | b0f905c751ded462c1c4400c3a7c1d1513608a5b (diff) | |
| download | puppet-gluster-221e3049f04fb608d013d7092bcfb258010b2d6d.tar.gz puppet-gluster-221e3049f04fb608d013d7092bcfb258010b2d6d.tar.xz puppet-gluster-221e3049f04fb608d013d7092bcfb258010b2d6d.zip | |
Add support for setting: 'rpc-auth-allow-insecure' in glusterd.vol.
| -rw-r--r-- | manifests/server.pp | 6 | ||||
| -rw-r--r-- | manifests/simple.pp | 2 | ||||
| -rw-r--r-- | templates/glusterd.vol.erb | 3 |
3 files changed, 11 insertions, 0 deletions
diff --git a/manifests/server.pp b/manifests/server.pp index c306f22..8274c02 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -23,6 +23,7 @@ class gluster::server( $vrrp = false, $password = '', # global vrrp password to use $baseport = '', # specify base port option as used in glusterd.vol file + $rpcauthallowinsecure = false, # needed in some setups in glusterd.vol $shorewall = false, $zone = 'net', # TODO: allow a list of zones $ips = false, # an optional list of ip's for each in hosts[] @@ -76,6 +77,11 @@ class gluster::server( # https://bugzilla.redhat.com/show_bug.cgi?id=987555 $valid_baseport = inline_template('<%= [Fixnum, String].include?(@baseport.class) ? @baseport.to_i : 0 %>') + $valid_rpcauthallowinsecure = $rpcauthallowinsecure ? { + true => true, + default => false, + } + file { '/etc/glusterfs/glusterd.vol': content => template('gluster/glusterd.vol.erb'), owner => root, diff --git a/manifests/simple.pp b/manifests/simple.pp index 44ec2c6..356ece7 100644 --- a/manifests/simple.pp +++ b/manifests/simple.pp @@ -26,6 +26,7 @@ class gluster::simple( $vrrp = false, $password = '', # global vrrp password to use $baseport = '', # specify base port option as used in glusterd.vol file + $rpcauthallowinsecure = false, # needed in some setups in glusterd.vol $shorewall = true ) { include gluster::vardir @@ -68,6 +69,7 @@ class gluster::simple( vrrp => $vrrp, password => "${password}", baseport => $baseport, + rpcauthallowinsecure => $rpcauthallowinsecure, #zone => 'net', # defaults to net shorewall => $shorewall, } diff --git a/templates/glusterd.vol.erb b/templates/glusterd.vol.erb index 5285aa0..31853ba 100644 --- a/templates/glusterd.vol.erb +++ b/templates/glusterd.vol.erb @@ -5,6 +5,9 @@ volume management option transport.socket.keepalive-time 10 option transport.socket.keepalive-interval 2 option transport.socket.read-fail-log off +<% if @valid_rpcauthallowinsecure -%> + option rpc-auth-allow-insecure on +<% end -%> <% if @valid_baseport > 0 -%> option base-port <%= @valid_baseport %> <% else -%> |