diff options
author | John Keiser <jkeiser@opscode.com> | 2014-05-26 22:17:16 -0700 |
---|---|---|
committer | John Keiser <jkeiser@opscode.com> | 2014-05-26 22:17:16 -0700 |
commit | d1c2aa92003aa634af1a23ec3975e1641620b643 (patch) | |
tree | 5d0f01d294f8267d5f6e2befd12190d4f738ab88 | |
parent | 8be4c781bc8b624dafde8eb9d5ba869c7ebf33d2 (diff) | |
download | chef-zero-d1c2aa92003aa634af1a23ec3975e1641620b643.tar.gz |
Don't flip on org defaults by default (backcompat)
-rw-r--r-- | lib/chef_zero/data_store/v1_to_v2_adapter.rb | 26 |
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 |