Merge pull request #39 from ravaa/master

fix for #31 , implements support for bootstrap-expect and now creates the data_dir

.kitchen.yml

@@ -43,3 +43,10 @@ suites:
       consul:
          serve_ui: true
          client_interface: eth0
+  - name: cluster
+    run_list:
+      - recipe[consul::default]
+    attributes:
+      consul:
+        service_mode: cluster
+        bootstrap_expect: 1

README.md

@@ -48,8 +48,14 @@ Installs and configures [Consul][1].
   <tr>
     <td><tt>['consul']['service_mode']</tt></td>
     <td>String</td>
-    <td>Mode to run consul as: bootstrap, server, or client</td>
+    <td>Mode to run consul as: bootstrap, cluster, server, or client</td>
     <td><tt>bootstrap</tt></td>
+  </tr>
+    <tr>
+    <td><tt>['consul'][bootstrap_expect]</tt></td>
+    <td>String</td>
+    <td>When bootstrapping a cluster, the number of server nodes to expect.</td>
+    <td><tt>nil</tt></td>
   </tr>
   <tr>
     <td><tt>['consul']['data_dir']</tt></td>

metadata.rb

@@ -4,7 +4,7 @@
 license 'Apache v2.0'
 description 'Installs/Configures consul'
 long_description 'Installs/Configures consul'
-version '0.4.1'
+version '0.4.2'
 
 recipe 'consul', 'Installs and starts consul service.'
 recipe 'consul::install_binary', 'Installs consul service from binary.'

recipes/_service.rb

@@ -19,6 +19,7 @@
 
 # Configure directories
 consul_directories = []
+consul_directories << node['consul']['data_dir']
 consul_directories << node['consul']['config_dir']
 consul_directories << '/var/lib/consul'
 
@@ -64,11 +65,19 @@
 # Determine service params
 service_config = {}
 service_config['data_dir'] = node['consul']['data_dir']
+num_cluster = node['consul']['bootstrap_expect'].to_i
 
 case node['consul']['service_mode']
 when 'bootstrap'
   service_config['server'] = true
   service_config['bootstrap'] = true
+when 'cluster'
+  service_config['server'] = true
+  if num_cluster > 1
+    service_config['bootstrap_expect'] = num_cluster
+  else
+    service_config['bootstrap'] = true
+  end
 when 'server'
   service_config['server'] = true
   service_config['start_join'] = node['consul']['servers']