diff options
| author | Tim Smith <tsmith@chef.io> | 2021-02-23 10:00:56 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-23 10:00:56 -0800 |
| commit | 79f22afa0f117522e1dc0fbd3bd62b4e31562fbe (patch) | |
| tree | 2384afacd7c0b07771c196ae6329e14b96802a5c | |
| parent | e535832fab2322c392c65516192abc421c35b5d9 (diff) | |
| parent | 5dfd214000ef5bff4f8d760885e6de6900345cc3 (diff) | |
| download | chef-79f22afa0f117522e1dc0fbd3bd62b4e31562fbe.tar.gz | |
Merge pull request #11086 from ramereth/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 d6a3b40bf8..9dac062a87 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" |