Merge remote-tracking branch 'upstream/master'

sous-chefs · Oct 24, 2014 · 6adbdcf · 6adbdcf
2 parents 3c9b497 + 553d25f
commit 6adbdcf
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -32,6 +32,12 @@ Installs and configures [Consul][1].
     <td>String</td>
     <td>Base URL for binary downloads</td>
     <td><tt>https://dl.bintray.com/mitchellh/consul/</tt></td>
+  </tr>
+   <tr>
+    <td><tt>['consul']['encrypt']</tt></td>
+    <td>String</td>
+    <td>Encryption string for consul cluster.</td>
+    <td><tt>nil</tt></td>
   </tr>
   <tr>
     <td><tt>['consul']['install_method']</tt></td>

diff --git a/metadata.rb b/metadata.rb
@@ -4,7 +4,7 @@
 license 'Apache v2.0'
 description 'Installs/Configures consul'
 long_description 'Installs/Configures consul'
-version '0.4.4'
+version '0.5.0'
 
 recipe 'consul', 'Installs and starts consul service.'
 recipe 'consul::install_binary', 'Installs consul service from binary.'

diff --git a/recipes/_service.rb b/recipes/_service.rb
@@ -85,7 +85,7 @@
 when 'client'
   service_config['start_join'] = node['consul']['servers']
 else
-  Chef::Application.fatal! %Q(node['consul']['service_mode'] must be "bootstrap", "server", or "client")
+  Chef::Application.fatal! %Q(node['consul']['service_mode'] must be "bootstrap", "cluster", "server", or "client")
 end
 
 iface_addr_map = {