Don't flip on org defaults by default (backcompat)

1 files changed, 14 insertions, 12 deletions

diff --git a/lib/chef_zero/data_store/v1_to_v2_adapter.rb b/lib/chef_zero/data_store/v1_to_v2_adapter.rb
index 56641a6..29dbd19 100644
--- a/lib/chef_zero/data_store/v1_to_v2_adapter.rb
+++ b/lib/chef_zero/data_store/v1_to_v2_adapter.rb
@@ -6,21 +6,23 @@ module ChefZero
       def initialize(real_store, single_org, options = {})
         @real_store = real_store
         @single_org = single_org
-        org_defaults = options[:org_defaults] || {
-          'clients' => {
-            'chef-validator' => '{ "validator": true }',
-            'chef-webui' => '{ "admin": true }'
-          },
-          'environments' => {
-            '_default' => '{ "description": "The default Chef environment" }'
-          },
-          'users' => {
-            'admin' => '{ "admin": "true" }'
-          }
-        }
+        org_defaults = options[:org_defaults] || {}
         @defaults = { 'organizations' => { single_org => org_defaults }}
       end
 
+      ORG_DEFAULTS = {
+        'clients' => {
+          'chef-validator' => '{ "validator": true }',
+          'chef-webui' => '{ "admin": true }'
+        },
+        'environments' => {
+          '_default' => '{ "description": "The default Chef environment" }'
+        },
+        'users' => {
+          'admin' => '{ "admin": "true" }'
+        }
+      }
+
       attr_reader :real_store
       attr_reader :single_org