diff options
Diffstat (limited to 'lib/chef_zero/chef_data/default_creator.rb')
| -rw-r--r-- | lib/chef_zero/chef_data/default_creator.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/chef_zero/chef_data/default_creator.rb b/lib/chef_zero/chef_data/default_creator.rb index 0618176..51872d5 100644 --- a/lib/chef_zero/chef_data/default_creator.rb +++ b/lib/chef_zero/chef_data/default_creator.rb @@ -240,11 +240,11 @@ module ChefZero when "groups/admins" admins = data.list(path[0..1] + [ "users" ]).select do |name| - user = FFI_Yajl::Parser.parse(data.get(path[0..1] + [ "users", name ]), :create_additions => false) + user = FFI_Yajl::Parser.parse(data.get(path[0..1] + [ "users", name ])) user["admin"] end admins += data.list(path[0..1] + [ "clients" ]).select do |name| - client = FFI_Yajl::Parser.parse(data.get(path[0..1] + [ "clients", name ]), :create_additions => false) + client = FFI_Yajl::Parser.parse(data.get(path[0..1] + [ "clients", name ])) client["admin"] end admins += @creators[path[0..1]] if @creators[path[0..1]] @@ -353,7 +353,7 @@ module ChefZero # Non-validator clients own themselves. if path.size == 4 && path[0] == "organizations" && path[2] == "clients" begin - client = FFI_Yajl::Parser.parse(data.get(path), :create_additions => false) + client = FFI_Yajl::Parser.parse(data.get(path)) if !client["validator"] unknown_owners |= [ path[3] ] end @@ -365,7 +365,7 @@ module ChefZero if @creators[path] @creators[path].each do |creator| begin - client = FFI_Yajl::Parser.parse(data.get(path[0..2] + [ creator ]), :create_additions => false) + client = FFI_Yajl::Parser.parse(data.get(path[0..2] + [ creator ])) next if client["validator"] rescue end @@ -440,7 +440,7 @@ module ChefZero def get_container_acl(acl_path) parent_path = AclPath.parent_acl_data_path(acl_path) if parent_path - FFI_Yajl::Parser.parse(data.get(parent_path), :create_additions => false) + FFI_Yajl::Parser.parse(data.get(parent_path)) else nil end |