[dev_setup] install redis along with cc

Change-Id: I6dcc5b95a624569d4f3616c6d12d8dd8d45d5263

dev_setup/cookbooks/cloud_controller/attributes/default.rb

@@ -34,3 +34,6 @@
 default[:capacity][:max_uris] = 4
 default[:capacity][:max_services] = 16
 default[:capacity][:max_apps] = 20
+
+default[:vcap_redis][:port] = "5454"
+default[:vcap_redis][:password] = "PoIxbL98RWpwBuUJvKNojnpIcRb1ot2"

dev_setup/cookbooks/cloud_controller/recipes/default.rb

@@ -40,6 +40,26 @@
 
 cf_pg_reset_user_password(:ccdb)
 
+
+template "vcap_redis.conf" do
+  path File.join(node[:deployment][:config_path], "vcap_redis.conf")
+  source "vcap_redis.conf.erb"
+  owner node[:deployment][:user]
+  mode 0644
+end
+
+template "vcap_redis" do
+  path File.join("", "etc", "init.d", "vcap_redis")
+  source "vcap_redis.erb"
+  owner node[:deployment][:user]
+  mode 0755
+end
+
+service "vcap_redis" do
+  supports :status => true, :restart => true, :reload => true
+  action [ :enable, :restart ]
+end
+
 staging_dir = File.join(node[:deployment][:config_path], "staging")
 node[:cloud_controller][:staging].each_pair do |framework, config|
   template config do

dev_setup/cookbooks/stager/attributes/default.rb

@@ -1,7 +1,4 @@
 default[:stager][:config_file] = "stager.yml"
 
-default[:vcap_redis][:port] = "5454"
-default[:vcap_redis][:password] = "PoIxbL98RWpwBuUJvKNojnpIcRb1ot2"
-
 # Staging
 default[:stager][:platform] = "platform.yml"

dev_setup/cookbooks/stager/recipes/default.rb

@@ -14,25 +14,6 @@
   mode 0644
 end
 
-template "vcap_redis.conf" do
-  path File.join(node[:deployment][:config_path], "vcap_redis.conf")
-  source "vcap_redis.conf.erb"
-  owner node[:deployment][:user]
-  mode 0644
-end
-
-template "vcap_redis" do
-  path File.join("", "etc", "init.d", "vcap_redis")
-  source "vcap_redis.erb"
-  owner node[:deployment][:user]
-  mode 0755
-end
-
-service "vcap_redis" do
-  supports :status => true, :restart => true, :reload => true
-  action [ :enable, :restart ]
-end
-
 template node[:stager][:platform] do
   path File.join(node[:deployment][:config_path], node[:stager][:platform])
   source "platform.yml.erb"

dev_setup/roles/cloud_controller.json

@@ -10,6 +10,7 @@
                  "recipe[ruby]",
                  "recipe[ruby::ruby18]",
                  "recipe[nginx]",
+                 "recipe[redis]",
                  "recipe[ccdb]",
                  "recipe[cloud_controller]"]
 }

dev_setup/roles/stager.json

@@ -8,7 +8,6 @@
   "run_list" : [ "recipe[deployment]",
                  "recipe[essentials]",
                  "recipe[ruby]",
-                 "recipe[redis]",
                  "recipe[stager]",
                  "recipe[imagemagick]"]
 }