switched glusterfs off of autofs

modules/glusterfs/manifests/client.pp

@@ -1,26 +1,14 @@
 define glusterfs::client($server) {
-  include glusterfs, autofs
+  include glusterfs
+  file { "/etc/conf.d/glusterfs-client":
+    content => template("glusterfs/glusterfs-client.erb"),
+    before => Service["glusterfs-client"],
+    require => Class["glusterfs"]
+  }
   file { "/etc/glusterfs/glusterfs-client.vol":
     content => template("glusterfs/glusterfs-client.vol.erb"),
-    before => Exec["glusterfs-$name-update"],
+    before => Service["glusterfs-client"],
     require => Class["glusterfs"]
   }
-  exec { "glusterfs-auto-master":
-    command => '/bin/cat >>/etc/autofs/auto.master <<EOF
-### vvv ###
-/mnt/glusterfs /etc/autofs/auto.glusterfs --ghost
-### ^^^ ###
-EOF
-',
-    unless => "/bin/grep glusterfs /etc/autofs/auto.master 1>/dev/null",
-    require => Class["autofs"]
-  }
-  exec { "glusterfs-$name-update":
-    command => "/bin/cat >>/etc/autofs/auto.glusterfs <<EOF
-$name -fstype=glusterfs :/etc/glusterfs/glusterfs-client.vol
-EOF
-",
-    unless => "/bin/grep $name /etc/autofs/auto.glusterfs 1>/dev/null",
-    notify => Service["autofs"]
-  }
+  service { "glusterfs-client": enable => true, ensure => running }
 }

modules/glusterfs/manifests/server.pp

@@ -5,9 +5,5 @@
     before => Service["glusterfs-server"],
     require => Class["glusterfs"]
   }
-  service { "glusterfs-server":
-    enable => true,
-    ensure => running,
-    require => Class["glusterfs"]
-  }
+  service { "glusterfs-server": enable => true, ensure => running }
 }

modules/glusterfs/templates/glusterfs-client.erb

@@ -0,0 +1,11 @@
+### vvv ###
+MOUNTPOINT=/mnt/<%= name %>
+CLIENT_CONF=/etc/glusterfs/${SVCNAME}.vol
+### ^^^ ###
+
+#SERVER=127.0.0.1
+#SERVER_PORT=6996
+#SERVER_TRANSPORT=tcp
+
+# additional param like --volume-name 
+GLUSTER_OPTS=""