Merge pull request #26 from datasift/develop

Release fix to chef

chef/.kitchen.yml

@@ -40,3 +40,5 @@ suites:
         ds_build_gocd: {enabled: true}
       java:
         jdk_version: 7
+      influxdb:
+        source: https://s3.amazonaws.com/influxdb/influxdb-0.8.8-1.x86_64.rpm

chef/Berksfile

@@ -14,4 +14,4 @@ cookbook 'kafka',
          branch: 'v0.7.1'
 cookbook 'influxdb',
          git: 'https://github.com/datasift/chef-influxdb.git',
-         ref: 'c555ef33ba2373a67712153c4fdc0da7bbecb56e'
+         ref: '232e2afd4afb29b6eecb3369de84f1674272cd59'

chef/cookbooks/datasift-stats/attributes/default.rb

@@ -14,6 +14,8 @@
 default['influxdb']['source'] = \
   'https://s3.amazonaws.com/influxdb/influxdb-0.8.8-1.x86_64.rpm'
 
+default['influxdb']['version'] = '0.8'
+
 # Parameters to configure InfluxDB
 # Based on https://github.com/influxdb/influxdb/blob/v0.8.5/config.sample.toml
 default['influxdb']['config'] = {

chef/cookbooks/datasift-stats/recipes/influxdb.rb

@@ -1,9 +1,6 @@
+user 'influxdb'
 
-influxdb 'main' do
-  source node['influxdb']['source']
-  config node['influxdb']['config']
-  action :create
-end
+include_recipe 'influxdb::default'
 
 supervisor_service 'influxdb' do
   user 'influxdb'

chef/nodes/datasift-connector.json

@@ -14,6 +14,9 @@
   "java": {
     "jdk_version": 7
   },
+  "influxdb": {
+    "source": "https://s3.amazonaws.com/influxdb/influxdb-0.8.8-1.x86_64.rpm"
+  },
   "run_list": [
     "recipe[java]",
     "recipe[supervisor]",
@@ -23,4 +26,4 @@
     "recipe[gnip-reader]",
     "recipe[webapp]"
   ]
-}
+}