Merge pull request #98 from inean/master

Allow custom data bag and data bag item for consul encrypt
sous-chefs · Dec 13, 2014 · 8dc6de1 · 8dc6de1
2 parents 72b9230 + 2ebad90
commit 8dc6de1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -61,7 +61,7 @@
 default['consul']['servers'] = []
 default['consul']['init_style'] = 'init' # 'init', 'runit'
 
-case node['consul']['init_style'] 
+case node['consul']['init_style']
 when 'runit'
  default['consul']['service_user'] = 'consul'
  default['consul']['service_group'] = 'consul'
@@ -79,6 +79,10 @@
  "server" => 8300,
 }
 
+# Consul DataBag
+default['consul']['data_bag'] = 'consul'
+default['consul']['data_bag_encrypt_item'] = 'encrypt'
+
 # Gossip encryption
 default['consul']['encrypt_enabled'] = false
 default['consul']['encrypt'] = nil

diff --git a/libraries/encrypt.rb b/libraries/encrypt.rb
@@ -4,7 +4,7 @@ class Recipe
  def consul_encrypted_dbi
  begin
  # loads the secret from /etc/chef/encrypted_data_bag_secret
- Chef::EncryptedDataBagItem.load('consul', 'encrypt')
+ Chef::EncryptedDataBagItem.load(node['consul']['data_bag'], node['consul']['data_bag_encrypt_item'])
  rescue Net::HTTPServerException => e
  raise e unless e.response.code == '404'
  end