From e13fedb2a3480e9ec8d4f0798441069c6b27708e Mon Sep 17 00:00:00 2001
From: Marcel Hild <hild@b4mad.net>
Date: Thu, 27 Oct 2016 16:15:37 +0200
Subject: [PATCH] add same settings.yml lookup paths for vmdb plugins

---
 lib/vmdb/settings.rb | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/lib/vmdb/settings.rb b/lib/vmdb/settings.rb
index eaa0bb3c7e6..737a1b118b4 100644
--- a/lib/vmdb/settings.rb
+++ b/lib/vmdb/settings.rb
@@ -109,21 +109,32 @@ def self.build_without_local(resource)
     end
     private_class_method :build_without_local
 
+    def self.template_roots
+      Vmdb::Plugins.instance.vmdb_plugins.each_with_object([Rails.root.join('config')]) do |plugin, roots|
+        roots << plugin.root.join('config')
+      end
+    end
+    private_class_method :template_roots
+
     def self.template_sources
-      [
-        Rails.root.join("config/settings.yml").to_s,
-        Rails.root.join("config/settings/#{Rails.env}.yml").to_s,
-        Rails.root.join("config/environments/#{Rails.env}.yml").to_s
-      ]
+      template_roots.each_with_object([]) do |root, sources|
+        sources.push(
+          root.join("settings.yml").to_s,
+          root.join("settings/#{Rails.env}.yml").to_s,
+          root.join("environments/#{Rails.env}.yml").to_s
+        )
+      end
     end
     private_class_method :template_sources
 
     def self.local_sources
-      [
-        Rails.root.join("config/settings.local.yml").to_s,
-        Rails.root.join("config/settings/#{Rails.env}.local.yml").to_s,
-        Rails.root.join("config/environments/#{Rails.env}.local.yml").to_s
-      ]
+      template_roots.each_with_object([]) do |root, sources|
+        sources.push(
+          root.join("settings.local.yml").to_s,
+          root.join("settings/#{Rails.env}.local.yml").to_s,
+          root.join("environments/#{Rails.env}.local.yml").to_s
+        )
+      end
     end
     private_class_method :local_sources