From 6c67f33d08f68e2cda898d0161f5820cd9f32c0e Mon Sep 17 00:00:00 2001 From: Colleen Murphy Date: Fri, 5 Dec 2014 10:41:53 -0800 Subject: [PATCH] (MODULES-1186) Allow disk as a valid cluster node type http://www.rabbitmq.com/clustering.html --- manifests/init.pp | 2 +- manifests/server.pp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 3d881df38..2af7279a6 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -67,7 +67,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) diff --git a/manifests/server.pp b/manifests/server.pp index d37730c28..5de14e0d7 100644 --- a/manifests/server.pp +++ b/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,