diff options
| author | John Keiser <john@johnkeiser.com> | 2016-01-27 15:47:03 -0800 |
|---|---|---|
| committer | John Keiser <john@johnkeiser.com> | 2016-01-28 08:36:52 -0800 |
| commit | 80783dac0105c37a857534d91cf38918608c3966 (patch) | |
| tree | 263d371284d298c4e50466ec0cc7faca74674ac2 | |
| parent | 832f9a48dcef5e29b1a65ddfde9503c95f3b4db5 (diff) | |
| download | chef-zero-cd/run-acl-specs.tar.gz | |
Fix container creation (was using wrong path)cd/run-acl-specs
| -rw-r--r-- | Gemfile | 5 | ||||
| -rw-r--r-- | lib/chef_zero/endpoints/containers_endpoint.rb | 3 | ||||
| -rw-r--r-- | spec/run_oc_pedant.rb | 2 |
3 files changed, 3 insertions, 7 deletions
@@ -5,10 +5,7 @@ gem 'rest-client', :github => 'chef/rest-client' gem 'oc-chef-pedant', :github => 'chef/chef-server', :branch => "jk/authorization-tags" -# gem 'oc-chef-pedant', :path => "../chef-server" - # bundler resolve failure on "rspec_junit_formatter" # gem 'chef-pedant', :github => 'opscode/chef-pedant', :ref => "server-cli-option" -gem 'chef', :github => 'chef/chef' -# gem 'chef', :path => "../chef" +gem 'chef', :github => 'chef/chef', :branch => 'jk/policies-acls' diff --git a/lib/chef_zero/endpoints/containers_endpoint.rb b/lib/chef_zero/endpoints/containers_endpoint.rb index 931fe6c..8a4220f 100644 --- a/lib/chef_zero/endpoints/containers_endpoint.rb +++ b/lib/chef_zero/endpoints/containers_endpoint.rb @@ -16,8 +16,7 @@ module ChefZero # if they don't match, id wins. container_name = data["id"] || data["containername"] container_path_suffix = data["containerpath"].split("/").reject { |o| o.empty? } - container_data_path = request.rest_path + container_path_suffix - create_data(request, container_data_path, container_name, to_json({}), :create_dir) + create_data(request, request.rest_path, container_name, to_json({}), :create_dir) json_response(201, { uri: build_uri(request.base_uri, request.rest_path + container_path_suffix + [container_name]) }) end diff --git a/spec/run_oc_pedant.rb b/spec/run_oc_pedant.rb index 3c7c4eb..47d878b 100644 --- a/spec/run_oc_pedant.rb +++ b/spec/run_oc_pedant.rb @@ -141,7 +141,7 @@ begin Pedant.setup(pedant_args) - fail_fast = [] + fail_fast = %w()#--fail-fast) #fail_fast = ["--fail-fast"] result = RSpec::Core::Runner.run(Pedant.config.rspec_args + fail_fast) |