Disable hostname management and use the right redis node for search

rubygems · Jul 13, 2014 · c69e1c5 · c69e1c5
1 parent e39fd7f
commit c69e1c5
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 7 deletions.
diff --git a/Berksfile.lock b/Berksfile.lock
@@ -173,7 +173,7 @@ GRAPH
   redisio (1.7.1)
     ulimit (>= 0.1.2)
   rsyslog (1.12.2)
-  rubygems (0.0.22)
+  rubygems (0.0.23)
     ohai (>= 0.0.0)
     rubygems-apt (>= 0.0.0)
     rubygems-chef (>= 0.0.0)
@@ -189,7 +189,7 @@ GRAPH
     rubygems-sensu (>= 0.0.0)
     rubygems-ssh (>= 0.0.0)
     rubygems-utility (>= 0.0.0)
-  rubygems-app (0.0.23)
+  rubygems-app (0.0.24)
     apt (>= 0.0.0)
     chef-vault (>= 0.0.0)
     git (>= 0.0.0)

diff --git a/cookbooks/rubygems-app/metadata.rb b/cookbooks/rubygems-app/metadata.rb
@@ -1,6 +1,6 @@
 name 'rubygems-app'
 
-version '0.0.23'
+version '0.0.24'
 
 depends 'apt'
 depends 'chef-vault'

diff --git a/cookbooks/rubygems-app/recipes/delayed_job.rb b/cookbooks/rubygems-app/recipes/delayed_job.rb
@@ -3,7 +3,7 @@
 # Recipe:: delayed_job
 #
 
-redis_ip = search('node', "name:redis01.#{node.chef_environment}.rubygems.org")[0]['ipaddress']
+redis_ip = search('node', "name:redis02.#{node.chef_environment}.rubygems.org")[0]['ipaddress']
 
 runit_service 'delayed_job' do
   owner 'deploy'

diff --git a/cookbooks/rubygems-app/recipes/unicorn.rb b/cookbooks/rubygems-app/recipes/unicorn.rb
@@ -10,7 +10,7 @@
   before_fork 'sleep 1'
 end
 
-redis_ip = search('node', "name:redis01.#{node.chef_environment}.rubygems.org")[0]['ipaddress']
+redis_ip = search('node', "name:redis02.#{node.chef_environment}.rubygems.org")[0]['ipaddress']
 
 runit_service 'unicorn' do
   owner 'deploy'

diff --git a/cookbooks/rubygems/metadata.rb b/cookbooks/rubygems/metadata.rb
@@ -2,7 +2,7 @@
 maintainer       'RubyGems.org Ops Team'
 license          'MIT'
 description      'RubyGems base recipes'
-version          '0.0.22'
+version          '0.0.23'
 
 depends 'rubygems-apt'
 depends 'rubygems-chef'

diff --git a/cookbooks/rubygems/recipes/default.rb b/cookbooks/rubygems/recipes/default.rb
@@ -9,7 +9,6 @@
 include_recipe 'rubygems-apt'
 include_recipe 'rubygems-chef'
 include_recipe 'rubygems-cloud-init'
-include_recipe 'rubygems-hostname'
 include_recipe 'rubygems-hosts'
 include_recipe 'rubygems-logging'
 include_recipe 'rubygems-metrics'