Restructure host lookup data bag

rubygems · Jul 19, 2014 · d66fe85 · d66fe85
1 parent 2e19c20
commit d66fe85
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/Berksfile.lock b/Berksfile.lock
@@ -190,7 +190,7 @@ GRAPH
     rubygems-sensu (>= 0.0.0)
     rubygems-ssh (>= 0.0.0)
     rubygems-utility (>= 0.0.0)
-  rubygems-app (0.0.27)
+  rubygems-app (0.0.28)
     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.27'
+version '0.0.28'
 
 depends 'apt'
 depends 'chef-vault'

diff --git a/cookbooks/rubygems-app/recipes/config.rb b/cookbooks/rubygems-app/recipes/config.rb
@@ -5,7 +5,7 @@
 
 include_recipe 'chef-vault'
 
-dbhost = data_bag_item('database', 'hosts')['environments'][node.chef_environment]
+dbhost = data_bag_item('hosts', 'database')['environments'][node.chef_environment]
 
 secrets = chef_vault_item('rubygems', node.chef_environment)
 db_host = search(:node, "name:#{dbhost}.#{node.chef_environment}.rubygems.org")[0]

diff --git a/data_bags/database/hosts.json → data_bags/hosts/database.json b/data_bags/database/hosts.json → data_bags/hosts/database.json
@@ -1,5 +1,5 @@
 {
-    "id": "hosts",
+    "id": "database",
     "environments": {
       "staging": "db01",
       "production": "db03"