diff options
| author | Tim Smith <tsmith@chef.io> | 2019-11-12 15:48:05 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-12 15:48:05 -0800 |
| commit | 8378cbf48410e5a87c96b78212793d9dab72b348 (patch) | |
| tree | a01d530202300068e0bb0841e086cd53abbfa38a | |
| parent | f1bd7b236cc76c26b077416e1f25abcab3329d44 (diff) | |
| parent | 95775425dcbc5c13e0a3a7c62590059b45619a45 (diff) | |
| download | chef-8378cbf48410e5a87c96b78212793d9dab72b348.tar.gz | |
Merge pull request #9088 from chef/chef-sugar-cleanup
Remove the use of Chef Sugar from the Kitchen tests
| -rw-r--r-- | kitchen-tests/cookbooks/end_to_end/attributes/default.rb | 4 | ||||
| -rw-r--r-- | kitchen-tests/cookbooks/end_to_end/libraries/chef-sugar.rb | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/kitchen-tests/cookbooks/end_to_end/attributes/default.rb b/kitchen-tests/cookbooks/end_to_end/attributes/default.rb index 7b66f77b4b..027d9881d8 100644 --- a/kitchen-tests/cookbooks/end_to_end/attributes/default.rb +++ b/kitchen-tests/cookbooks/end_to_end/attributes/default.rb @@ -1,5 +1,5 @@ -puts "CHEF SUGAR THINKS WE ARE ON UBUNTU" if ubuntu? -puts "CHEF SUGAR THINKS WE ARE ON RHEL" if rhel? +puts "CHEF UTILS THINKS WE ARE ON UBUNTU" if ubuntu? +puts "CHEF UTILS THINKS WE ARE ON RHEL" if rhel? # # ubuntu cookbook overrides diff --git a/kitchen-tests/cookbooks/end_to_end/libraries/chef-sugar.rb b/kitchen-tests/cookbooks/end_to_end/libraries/chef-sugar.rb deleted file mode 100644 index 90d02a361f..0000000000 --- a/kitchen-tests/cookbooks/end_to_end/libraries/chef-sugar.rb +++ /dev/null @@ -1,4 +0,0 @@ -require "chef/sugar" - -# hack until this gets baked into chef-sugar so we can use chef-sugar in attributes files -Chef::Node.send(:include, Chef::Sugar::DSL) |