From 5697cf02ff4d4f06385c0aaf9bc22ba91ae7606f Mon Sep 17 00:00:00 2001
From: Tony Zanella <tony.zanella@gmail.com>
Date: Wed, 25 Oct 2017 11:24:27 -0700
Subject: [PATCH] Get settings for fixture storage roots out of the way of
 shared_configs

---
 config/settings.yml             | 9 ++++++---
 config/settings/development.yml | 7 +++++++
 config/settings/test.yml        | 6 ++++++
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/config/settings.yml b/config/settings.yml
index b0b73309b..437c1afb2 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -12,10 +12,13 @@ endpoints:
 
 moab:
   # this is a list of named storage roots.  the names are used to seed the endpoints table.
-  storage_roots:
+  # any named storage roots added in the root settings.yml will always be inherited by env specific configs, even
+  # if they aren't listed directly in the settings/*.yml file for an environment. so list storage roots directly in
+  # the relevant settings file for the env, including for vanilla unit test env.
+  # storage_roots:
     # name: '/location/on/disk'  # e.g.
-    fixture_sr1: 'spec/fixtures/storage_root01'
-    fixture_sr2: 'spec/fixtures/storage_root02'
+    # fixture_sr1: 'spec/fixtures/storage_root01'
+    # fixture_sr2: 'spec/fixtures/storage_root02'
   # storage_trunk is the name of the directory under a storage_root which contains
   # the druid trees:  e.g. 'spec/fixtures/moab_storage_root' will contain all the druid
   # trees for this configuration.  if there are multiple storage roots, each will have
diff --git a/config/settings/development.yml b/config/settings/development.yml
index e69de29bb..295754fba 100644
--- a/config/settings/development.yml
+++ b/config/settings/development.yml
@@ -0,0 +1,7 @@
+moab:
+  # this is a list of named storage roots.  the names are used to seed the endpoints table.
+  storage_roots:
+    # name: '/location/on/disk'  # e.g.
+    fixture_sr1: 'spec/fixtures/storage_root01'
+    fixture_sr2: 'spec/fixtures/storage_root02'
+  
diff --git a/config/settings/test.yml b/config/settings/test.yml
index e69de29bb..d4473f7f0 100644
--- a/config/settings/test.yml
+++ b/config/settings/test.yml
@@ -0,0 +1,6 @@
+moab:
+  # this is a list of named storage roots.  the names are used to seed the endpoints table.
+  storage_roots:
+    # name: '/location/on/disk'  # e.g.
+    fixture_sr1: 'spec/fixtures/storage_root01'
+    fixture_sr2: 'spec/fixtures/storage_root02'