sort search output to prevent flapping on the meg config and nginx up…

…stream ordering
rubygems · Mar 14, 2015 · 4287ac6 · 4287ac6
1 parent b64f97c
commit 4287ac6
Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/Berksfile.lock b/Berksfile.lock
@@ -218,7 +218,7 @@ GRAPH
   rubygems-backups (0.0.21)
     chef-vault (>= 0.0.0)
     rubygems-ruby (>= 0.0.0)
-  rubygems-balancer (0.0.44)
+  rubygems-balancer (0.0.45)
     chef-vault (>= 0.0.0)
     datadog (>= 0.0.0)
     logrotate (>= 0.0.0)
@@ -286,7 +286,7 @@ GRAPH
     motd (>= 0.0.0)
   rubygems-ntp (0.0.3)
     ntp (>= 0.0.0)
-  rubygems-people (0.0.35)
+  rubygems-people (0.0.36)
     sudo (>= 0.0.0)
     user (>= 0.0.0)
   rubygems-redis (0.1.8)

diff --git a/cookbooks/rubygems-balancer/metadata.rb b/cookbooks/rubygems-balancer/metadata.rb
@@ -1,6 +1,6 @@
 name 'rubygems-balancer'
 
-version '0.0.44'
+version '0.0.45'
 
 depends 'chef-vault'
 depends 'datadog'

diff --git a/cookbooks/rubygems-balancer/recipes/site.rb b/cookbooks/rubygems-balancer/recipes/site.rb
@@ -24,7 +24,7 @@
   group  'root'
   mode   '0644'
   variables(
-    app_servers: search(:node, "roles:app AND chef_environment:#{node.chef_environment} AND in_rotation:true"),
+    app_servers: search(:node, "roles:app AND chef_environment:#{node.chef_environment} AND in_rotation:true").sort,
     server_names: ['rubygems.org', 'www.rubygems.org'],
     ssl_key:      File.join(node['nginx']['dir'], 'certs', 'rubygems.org.key'),
     ssl_cert:     File.join(node['nginx']['dir'], 'certs', 'rubygems.org.crt')

diff --git a/cookbooks/rubygems-people/metadata.rb b/cookbooks/rubygems-people/metadata.rb
@@ -2,7 +2,7 @@
 maintainer       'RubyGems.org Ops Team'
 license          'MIT'
 description      'RubyGems user recipes'
-version          '0.0.35'
+version          '0.0.36'
 
 depends 'user'
 depends 'sudo'

diff --git a/cookbooks/rubygems-people/recipes/default.rb b/cookbooks/rubygems-people/recipes/default.rb
@@ -6,7 +6,7 @@
 include_recipe 'user'
 
 meg_balancer_host = search('node', "roles:balancer AND chef_environment:#{node.chef_environment}")[0]['ipaddress'] rescue ''
-meg_app_host = search('node', "roles:app AND chef_environment:#{node.chef_environment}")[0]['ipaddress'] rescue ''
+meg_app_host = search('node', "roles:app AND chef_environment:#{node.chef_environment}").sort[0]['ipaddress'] rescue ''
 
 users = data_bag('users')
 sysadmins = []