From 84cfea597ff6d2b2320cf2f164730da1f5eefd8b Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 10 Nov 2021 22:25:12 +0000 Subject: [PATCH] Use kitchen? instead of looking for TEST_KITCHEN in the environent --- cookbooks/geoipupdate/recipes/default.rb | 2 +- cookbooks/networking/recipes/default.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cookbooks/geoipupdate/recipes/default.rb b/cookbooks/geoipupdate/recipes/default.rb index fedae0011..6d8e5b6e5 100644 --- a/cookbooks/geoipupdate/recipes/default.rb +++ b/cookbooks/geoipupdate/recipes/default.rb @@ -35,7 +35,7 @@ execute "geoipupdate" do command "geoipupdate" user "root" group "root" - not_if { ENV.key?("TEST_KITCHEN") || node[:geoipupdate][:editions].all? { |edition| ::File.exist?("/usr/share/GeoIP/#{edition}.mmdb") } } + not_if { kitchen? || node[:geoipupdate][:editions].all? { |edition| ::File.exist?("/usr/share/GeoIP/#{edition}.mmdb") } } end systemd_service "geoipupdate" do diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb index f43eaf2a7..3a30f20f9 100644 --- a/cookbooks/networking/recipes/default.rb +++ b/cookbooks/networking/recipes/default.rb @@ -295,7 +295,7 @@ if node[:networking][:wireguard][:enabled] action :nothing subscribes :restart, "template[/etc/systemd/network/wireguard.netdev]" subscribes :restart, "template[/etc/systemd/network/wireguard.network]" - not_if { ENV.key?("TEST_KITCHEN") } + not_if { kitchen? } end else execute "networkctl-delete-wg0" do @@ -310,7 +310,7 @@ if node[:networking][:wireguard][:enabled] command "networkctl reload" subscribes :run, "template[/etc/systemd/network/wireguard.netdev]" subscribes :run, "template[/etc/systemd/network/wireguard.network]" - not_if { ENV.key?("TEST_KITCHEN") } + not_if { kitchen? } end end end @@ -323,7 +323,7 @@ end execute "hostnamectl-set-hostname" do command "hostnamectl set-hostname #{node[:networking][:hostname]}" notifies :reload, "ohai[reload-hostname]" - not_if { ENV.key?("TEST_KITCHEN") || node[:hostnamectl][:static_hostname] == node[:networking][:hostname] } + not_if { kitchen? || node[:hostnamectl][:static_hostname] == node[:networking][:hostname] } end template "/etc/hosts" do -- 2.39.5