diff options
author | Tim Smith <tsmith84@gmail.com> | 2020-05-04 15:14:49 -0700 |
---|---|---|
committer | Tim Smith <tsmith84@gmail.com> | 2020-05-04 15:22:21 -0700 |
commit | 42e8fb3ac885547f931acb4a92dbc812c51de29c (patch) | |
tree | f955511fd1c947cbc176a12651aee351a2f791c1 /kitchen-tests/cookbooks | |
parent | dd0e2dbb8b299157c9bf82c9ac7d7dd374b31ca7 (diff) | |
download | chef-42e8fb3ac885547f931acb4a92dbc812c51de29c.tar.gz |
Fix sysctl :remove action failing with missing :value prop
Don't require this when removing.
Signed-off-by: Tim Smith <tsmith@chef.io>
Diffstat (limited to 'kitchen-tests/cookbooks')
-rw-r--r-- | kitchen-tests/cookbooks/end_to_end/recipes/_alternatives.rb (renamed from kitchen-tests/cookbooks/end_to_end/recipes/alternatives.rb) | 0 | ||||
-rw-r--r-- | kitchen-tests/cookbooks/end_to_end/recipes/_chef-vault.rb (renamed from kitchen-tests/cookbooks/end_to_end/recipes/chef-vault.rb) | 0 | ||||
-rw-r--r-- | kitchen-tests/cookbooks/end_to_end/recipes/_packages.rb (renamed from kitchen-tests/cookbooks/end_to_end/recipes/packages.rb) | 0 | ||||
-rw-r--r-- | kitchen-tests/cookbooks/end_to_end/recipes/_sysctl.rb | 12 | ||||
-rw-r--r-- | kitchen-tests/cookbooks/end_to_end/recipes/_tests.rb (renamed from kitchen-tests/cookbooks/end_to_end/recipes/tests.rb) | 0 | ||||
-rw-r--r-- | kitchen-tests/cookbooks/end_to_end/recipes/default.rb | 9 |
6 files changed, 17 insertions, 4 deletions
diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/alternatives.rb b/kitchen-tests/cookbooks/end_to_end/recipes/_alternatives.rb index 8e0a0bb178..8e0a0bb178 100644 --- a/kitchen-tests/cookbooks/end_to_end/recipes/alternatives.rb +++ b/kitchen-tests/cookbooks/end_to_end/recipes/_alternatives.rb diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/chef-vault.rb b/kitchen-tests/cookbooks/end_to_end/recipes/_chef-vault.rb index aa01982e3d..aa01982e3d 100644 --- a/kitchen-tests/cookbooks/end_to_end/recipes/chef-vault.rb +++ b/kitchen-tests/cookbooks/end_to_end/recipes/_chef-vault.rb diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/packages.rb b/kitchen-tests/cookbooks/end_to_end/recipes/_packages.rb index 58ede61f52..58ede61f52 100644 --- a/kitchen-tests/cookbooks/end_to_end/recipes/packages.rb +++ b/kitchen-tests/cookbooks/end_to_end/recipes/_packages.rb diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/_sysctl.rb b/kitchen-tests/cookbooks/end_to_end/recipes/_sysctl.rb new file mode 100644 index 0000000000..8c644e01c6 --- /dev/null +++ b/kitchen-tests/cookbooks/end_to_end/recipes/_sysctl.rb @@ -0,0 +1,12 @@ +# +# Cookbook:: end_to_end +# Recipe:: sysctl +# + +sysctl "vm.swappiness" do + value 19 +end + +sysctl "kernel.msgmax" do + action :remove +end
\ No newline at end of file diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/tests.rb b/kitchen-tests/cookbooks/end_to_end/recipes/_tests.rb index d74a310394..d74a310394 100644 --- a/kitchen-tests/cookbooks/end_to_end/recipes/tests.rb +++ b/kitchen-tests/cookbooks/end_to_end/recipes/_tests.rb diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/default.rb b/kitchen-tests/cookbooks/end_to_end/recipes/default.rb index 54750039c5..6378d55bcc 100644 --- a/kitchen-tests/cookbooks/end_to_end/recipes/default.rb +++ b/kitchen-tests/cookbooks/end_to_end/recipes/default.rb @@ -40,7 +40,7 @@ build_essential do raise_if_unsupported true end -include_recipe "::packages" +include_recipe "::_packages" include_recipe "ntp" @@ -158,6 +158,7 @@ locale "set system locale" do only_if { debian? } end -include_recipe "::chef-vault" unless includes_recipe?("end_to_end::chef-vault") -include_recipe "::alternatives" -include_recipe "::tests" +include_recipe "::_chef-vault" unless includes_recipe?("end_to_end::chef-vault") +include_recipe "::_sysctl" +include_recipe "::_alternatives" +include_recipe "::_tests" |