Fix unnecessarily setting gluster volume option repeatedly

Checks Gluster volume options against existing values to avoid repeatedly
setting values

Also adds these types:
+ `Gluster::VolumeName`
+ `Gluster::VolumeOption`

And these functions:
+ `gluster::cmd_volume_get_option`
+ `gluster::onoff`

Author: runejuhl

functions/cmd_volume_get_option.pp

@@ -0,0 +1,34 @@
+# Create a command string to get option `$opt` from gluster volume `$vol`, and
+# optionally compare it against `$comparison`.
+#
+# @param vol [Gluster::VolumeName] Gluster volume name
+# @param opt [Gluster::OptionName] Gluster volume option name
+# @param comparison [Optional[String]] Optional string to compare the existing
+#   value against
+# @return [String]
+#
+# @example Usage
+#
+#   ```puppet
+#   gluster::cmd_volume_get_option('data', 'nfs.disable', String(true))
+#   ```
+#
+function gluster::cmd_volume_get_option(
+  Gluster::VolumeName   $vol,
+  Gluster::VolumeOption $opt,
+  Optional[Any]         $comparison = undef,
+) {
+  $_cmd = "${::gluster_binary} volume get ${vol} ${opt}"
+
+  unless $comparison {
+    return $_cmd
+  }
+
+  $_comparison = $comparison ? {
+    Undef   => '\(null\)',
+    Boolean => gluster::onoff($comparison),
+    default => $comparison,
+  }
+
+  "${_cmd} | tail -n1 | grep -E '^${opt} +${_comparison} *\$'"
+}

functions/onoff.pp

@@ -0,0 +1,9 @@
+function gluster::onoff (
+  Boolean $value,
+) {
+  if $value {
+    'on'
+  } else {
+    'off'
+  }
+}

manifests/volume/option.pp

@@ -3,7 +3,8 @@
 # @param title
 #    the name of the volume, a colon, and the name of the option
 # @param value
-#    the value to set for this option
+#    the value to set for this option. Boolean values will be coerced to
+#    'on'/'off'.
 # @param ensure
 #    whether to set or remove an option
 #
@@ -30,31 +31,29 @@
   Enum['present', 'absent']                   $ensure = 'present',
 ) {
 
-  $arr = split( $title, ':' )
-  $count = count($arr)
+  $arr = $title.split(':')
   # do we have more than one array element?
-  if $count != 2 {
+  if count($arr) != 2 {
     fail("${title} does not parse as volume:option")
   }
-  $vol = $arr[0]
-  $opt = $arr[1]
+  [$vol, $opt] = $arr
+
+  $_value = $value ? {
+    Boolean => gluster::onoff($value),
+    default => String($value),
+  }
 
   $cmd = if $ensure == 'absent' {
     "reset ${vol} ${opt}"
   } else {
-    "set ${vol} ${opt} ${value}"
-  }
-
-  $_value = $value ? {
-    Boolean => if $value {
-      'on'
-    } else {
-      'off'
-    },
-    default => $value,
+    "set ${vol} ${opt} ${_value}"
   }
 
   exec { "gluster option ${vol} ${opt} ${_value}":
-    command => "${facts['gluster_binary']} volume ${cmd}",
+    path    => '/usr/bin:/usr/sbin:/bin',
+    command => "${::gluster_binary} volume ${cmd}",
+    unless  => unless $ensure == 'absent' {
+      gluster::cmd_volume_get_option($vol, $opt, $_value)
+    },
   }
 }

types/volumename.pp

@@ -0,0 +1 @@
+type Gluster::VolumeName = Pattern[/^[a-zA-Z0-9_-]+$/]

types/volumeoption.pp

@@ -0,0 +1 @@
+type Gluster::VolumeOption = Pattern[/^[a-z0-9]+\.[a-z0-9-]+$/]