diff options
| author | Tim Smith <tsmith@chef.io> | 2021-02-23 18:26:53 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-23 18:26:53 -0800 |
| commit | b9e40a04d0e7f635c94d59e4137520ed2305a1d2 (patch) | |
| tree | d3df42d263977afceefd47134e9dc1ee043e8a4d | |
| parent | 23af4056183e5a1da0be457bc7613676b56f97f9 (diff) | |
| parent | 09e99283b14530b0ac24923f4652bdb1e598e32c (diff) | |
| download | chef-b9e40a04d0e7f635c94d59e4137520ed2305a1d2.tar.gz | |
Merge pull request #11093 from ramereth/chef-16-fix-resolver-test-kitchen-tests
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | kitchen-tests/cookbooks/end_to_end/attributes/default.rb | 7 | ||||
| -rw-r--r-- | kitchen-tests/cookbooks/end_to_end/recipes/linux.rb | 5 | ||||
| -rw-r--r-- | kitchen-tests/cookbooks/end_to_end/recipes/macos.rb | 5 |
3 files changed, 8 insertions, 9 deletions
diff --git a/kitchen-tests/cookbooks/end_to_end/attributes/default.rb b/kitchen-tests/cookbooks/end_to_end/attributes/default.rb index e910b9e7d4..72430e9367 100644 --- a/kitchen-tests/cookbooks/end_to_end/attributes/default.rb +++ b/kitchen-tests/cookbooks/end_to_end/attributes/default.rb @@ -67,13 +67,6 @@ default["chef_client"]["config"]["verbose_logging"] = false default["chef_client"]["chef_license"] = "accept-no-persist" # -# resolver cookbook overrides -# - -default["resolver"]["nameservers"] = [ "8.8.8.8", "8.8.4.4" ] -default["resolver"]["search"] = "chef.io" - -# # nscd cookbook overrides # diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/linux.rb b/kitchen-tests/cookbooks/end_to_end/recipes/linux.rb index 8991cf1594..7f72c0b76a 100644 --- a/kitchen-tests/cookbooks/end_to_end/recipes/linux.rb +++ b/kitchen-tests/cookbooks/end_to_end/recipes/linux.rb @@ -39,7 +39,10 @@ include_recipe "::_packages" include_recipe "ntp" -include_recipe "resolver" +resolver_config "/etc/resolv.conf" do + nameservers [ "8.8.8.8", "8.8.4.4" ] + search [ "chef.io" ] +end users_manage "sysadmin" do group_id 2300 diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/macos.rb b/kitchen-tests/cookbooks/end_to_end/recipes/macos.rb index cb123d1225..a724c4882c 100644 --- a/kitchen-tests/cookbooks/end_to_end/recipes/macos.rb +++ b/kitchen-tests/cookbooks/end_to_end/recipes/macos.rb @@ -23,7 +23,10 @@ timezone "America/Los_Angeles" include_recipe "ntp" -include_recipe "resolver" +resolver_config "/etc/resolv.conf" do + nameservers [ "8.8.8.8", "8.8.4.4" ] + search [ "chef.io" ] +end users_manage "remove sysadmin" do group_name "sysadmin" |