Skip to content

Commit

Permalink
Merge pull request #216 from bkonick/org_full_name
Browse files Browse the repository at this point in the history
Fix org full name truncation
  • Loading branch information
Patrick Wright authored Jan 12, 2018
2 parents fb42c7d + 469b121 commit 374a0f8
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

This file is used to list changes made in each version of the chef-ingredient cookbook.

## 2.2.1 (2018-01-12)

- Resolve chef_org full name truncation issue (#215)

## 2.2.0 (2017-11-30)

- Resolve multiple issues with the custom resources in various Chef 12 releases by requiring Chef 12.7 or later and removing the usage of class_eval on the action_classes
Expand Down
2 changes: 1 addition & 1 deletion metadata.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name 'chef-ingredient'
version '2.2.0'
version '2.2.1'
maintainer 'Chef Software, Inc.'
maintainer_email '[email protected]'
license 'Apache-2.0'
Expand Down
2 changes: 1 addition & 1 deletion resources/chef_org.rb
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
key = (property_is_set?(:key_path) ? new_resource.key_path : "/etc/opscode/orgs/#{new_resource.org}-validation.pem")
execute "create-org-#{new_resource.org}" do
retries 10
command "chef-server-ctl org-create #{new_resource.org} #{org_full_name} -f #{key}"
command "chef-server-ctl org-create #{new_resource.org} '#{org_full_name}' -f #{key}"
not_if { node.run_state['chef-orgs'].index(/^#{new_resource.org}$/) }
end

Expand Down

0 comments on commit 374a0f8

Please sign in to comment.