syntax cleanup

rubygems · Jul 9, 2014 · ad421e8 · ad421e8
1 parent aeda71b
commit ad421e8
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
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:redis01.#{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:redis01.#{node.chef_environment}.rubygems.org")[0]['ipaddress']
 
 runit_service 'unicorn' do
   owner 'deploy'

diff --git a/cookbooks/rubygems-database/recipes/default.rb b/cookbooks/rubygems-database/recipes/default.rb
@@ -17,7 +17,7 @@
     'type' => 'host',
     'db' => "rubygems_#{node.chef_environment}",
     'user' => secrets['rails_postgresql_user'],
-    'addr' => "#{search(:node, "name:app01.#{node.chef_environment}.rubygems.org")[0]['ipaddress']}/0",
+    'addr' => "#{search('node', "name:app01.#{node.chef_environment}.rubygems.org")[0]['ipaddress']}/0",
     'method' => 'md5'
   },
   {

diff --git a/cookbooks/rubygems-hostname/recipes/dns.rb b/cookbooks/rubygems-hostname/recipes/dns.rb
@@ -22,7 +22,7 @@
 else
   dwradcliffe_dnsimple_record "create A record for #{node.name}" do
     name      node.name.sub('.rubygems.org', '')
-    content   `/usr/bin/curl http://169.254.169.254/latest/meta-data/public-ipv4`.chomp
+    content   Mixlib::ShellOut.new('/usr/bin/curl http://169.254.169.254/latest/meta-data/public-ipv4').run_command.stdout.chomp
     type      'A'
     domain    'rubygems.org'
     username  dnsimple_credentials['username']

diff --git a/cookbooks/rubygems-sensu/recipes/default.rb b/cookbooks/rubygems-sensu/recipes/default.rb
@@ -10,7 +10,7 @@
 
 # this will only ever return a single 'ip' key since node comes from
 # the node name and is therefore unique.
-monitoring_host = search(:node, 'name:monitoring01.common.rubygems.org')
+monitoring_host = search('node', 'name:monitoring01.common.rubygems.org')
 
 # set the address of the host to the local ipaddress if the node doesn't
 # exist in chef's index yet since it's being boostrapped.
@@ -23,8 +23,8 @@
 node.default['sensu']['redis']['port'] = 6379
 
 sensu_client node.name do
-  address node.ipaddress
-  subscriptions node.roles + ['all']
+  address node['ipaddress']
+  subscriptions node['roles'] + ['all']
   additional(environment: node.chef_environment)
 end