Fixes #239 - data bag item and name config.

This was an oversight that seemingly nobody ever caught.
sous-chefs · Jan 3, 2016 · 94d9ca0 · 94d9ca0
1 parent 6e6c96b
commit 94d9ca0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -8,10 +8,9 @@
 default['consul']['service_user'] = 'consul'
 default['consul']['service_group'] = 'consul'
 
-default['consul']['bag_name'] = 'secrets'
-default['consul']['bag_item'] = 'consul'
-
 default['consul']['config']['path'] = '/etc/consul.json'
+default['consul']['config']['bag_name'] = 'secrets'
+default['consul']['config']['bag_item'] = 'consul'
 default['consul']['config']['data_dir'] = '/var/lib/consul'
 default['consul']['config']['ca_file'] = '/etc/consul/ssl/CA/ca.crt'
 default['consul']['config']['cert_file'] = '/etc/consul/ssl/certs/consul.crt'

diff --git a/libraries/consul_config.rb b/libraries/consul_config.rb
@@ -27,11 +27,11 @@ class ConsulConfig < Chef::Resource
 
       # @!attribute bag_name
       # @return [String]
-      attribute(:bag_name, kind_of: String, default: 'consul')
+      attribute(:bag_name, kind_of: String, default: 'secrets')
 
       # @!attribute bag_item
       # @return [String]
-      attribute(:bag_item, kind_of: String, default: 'secrets')
+      attribute(:bag_item, kind_of: String, default: 'consul')
 
       # @!attribute options
       # @return [Hash]