Merge pull request #270 from cmurphy/disk-disc

(MODULES-1186) Allow disk as a valid cluster node type

Author: hunner

manifests/init.pp

@@ -68,7 +68,7 @@
   validate_re($version, '^\d+\.\d+\.\d+(-\d+)*$') # Allow 3 digits and optional -n postfix.
   # Validate config parameters.
   validate_array($cluster_disk_nodes)
-  validate_re($cluster_node_type, '^(ram|disc)$')
+  validate_re($cluster_node_type, '^(ram|disc|disk)$') # Both disc and disk are valid http://www.rabbitmq.com/clustering.html
   validate_array($cluster_nodes)
   validate_string($config)
   validate_absolute_path($config_path)

manifests/server.pp

@@ -17,7 +17,7 @@
 #  [*config_mirrored_queues*] - DEPRECATED (doesn't do anything)
 #  [*cluster_disk_nodes*] - DEPRECATED (use cluster_nodes instead)
 #  [*cluster_nodes*] - which nodes to cluster with (including the current one)
-#  [*cluster_node_type*] - Type of cluster node (disc or ram)
+#  [*cluster_node_type*] - Type of cluster node (disc/disk or ram)
 #  [*erlang_cookie*] - erlang cookie, must be the same for all nodes in a cluster
 #  [*wipe_db_on_cookie_change*] - whether to wipe the RabbitMQ data if the specified
 #    erlang_cookie differs from the current one. This is a sad parameter: actually,