[FIX] Fixed incorrect behaviour when merging elasticsearch.plugins …

…from databag with default plugins Closes #150
sous-chefs · Oct 24, 2013 · 711cd97 · 711cd97
1 parent 42db58c
commit 711cd97
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/attributes/plugins.rb b/attributes/plugins.rb
@@ -2,7 +2,7 @@
 
 plugins = Chef::DataBagItem.load('elasticsearch', 'plugins')[node.chef_environment].to_hash['plugins'] rescue {}
 
-Chef::Log.debug "Plugins list: #{plugins.keys.inspect}"
-
-node.default.elasticsearch[:plugins] ||= plugins
+node.default.elasticsearch[:plugins].merge!(plugins)
 node.default.elasticsearch[:plugin][:mandatory] = []
+
+Chef::Log.debug "Plugins list: #{default.elasticsearch.plugins.inspect}"