diff options
| author | John Keiser <john@johnkeiser.com> | 2016-01-27 15:10:58 -0800 |
|---|---|---|
| committer | John Keiser <john@johnkeiser.com> | 2016-01-27 15:10:58 -0800 |
| commit | 832f9a48dcef5e29b1a65ddfde9503c95f3b4db5 (patch) | |
| tree | a819408c02247766c90c4a2410a51edf422d656c | |
| parent | c007931bb19a65e32a6b162536916dd37ba6dbce (diff) | |
| download | chef-zero-832f9a48dcef5e29b1a65ddfde9503c95f3b4db5.tar.gz | |
Make default policy ACLs look more normal
| -rw-r--r-- | lib/chef_zero/chef_data/default_creator.rb | 10 | ||||
| -rw-r--r-- | spec/run_oc_pedant.rb | 4 |
2 files changed, 3 insertions, 11 deletions
diff --git a/lib/chef_zero/chef_data/default_creator.rb b/lib/chef_zero/chef_data/default_creator.rb index 701daaa..957018c 100644 --- a/lib/chef_zero/chef_data/default_creator.rb +++ b/lib/chef_zero/chef_data/default_creator.rb @@ -282,7 +282,7 @@ module ChefZero 'delete' => { 'groups' => %w(admins) }, 'grant' => { 'groups' => %w(admins) }, } - when 'containers/environments', 'containers/roles' + when 'containers/environments', 'containers/roles', 'containers/policy_groups', 'containers/policies' { 'create' => { 'groups' => %w(admins users) }, 'read' => { 'groups' => %w(admins users clients) }, @@ -290,14 +290,6 @@ module ChefZero 'delete' => { 'groups' => %w(admins users) }, 'grant' => { 'groups' => %w(admins) }, } - when 'containers/policy_groups', 'container/policies' - { - 'create' => { 'groups' => %w(admins) }, - 'read' => { 'groups' => %w(admins) }, - 'update' => { 'groups' => %w(admins) }, - 'delete' => { 'groups' => %w(admins) }, - 'grant' => { 'groups' => %w(admins users clients) }, - } when 'containers/cookbooks', 'containers/cookbook_artifacts', 'containers/data' { 'create' => { 'groups' => %w(admins users clients) }, diff --git a/spec/run_oc_pedant.rb b/spec/run_oc_pedant.rb index a08f839..3c7c4eb 100644 --- a/spec/run_oc_pedant.rb +++ b/spec/run_oc_pedant.rb @@ -83,7 +83,6 @@ begin '--skip-users', '--skip-organizations', '--skip-multiuser', - '--skip-acl', # chef-zero has some non-removable quirks, such as the fact that files # with 255-character names cannot be stored in local mode. This is @@ -142,7 +141,8 @@ begin Pedant.setup(pedant_args) - # fail_fast = ["--fail-fast"] + fail_fast = [] + #fail_fast = ["--fail-fast"] result = RSpec::Core::Runner.run(Pedant.config.rspec_args + fail_fast) |