summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-08-02 12:24:03 -0700
committerTim Smith <tsmith@chef.io>2018-08-02 14:19:40 -0700
commitc69930c46b908b87d267fdac3170c6b663624d70 (patch)
tree0723e571f4e54cc77afbe7feb605eb7efe4476f9
parent628b6189201c532ae0e3ff962b324018911ff389 (diff)
downloadchef-c69930c46b908b87d267fdac3170c6b663624d70.tar.gz
Set default_env true on RHSM resources to prevent failures
These started failing due to changes in how we manage paths when we shell out. This ensures we have the proper path set before running. Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--lib/chef/resource/rhsm_errata.rb1
-rw-r--r--lib/chef/resource/rhsm_errata_level.rb1
-rw-r--r--lib/chef/resource/rhsm_register.rb3
-rw-r--r--lib/chef/resource/rhsm_repo.rb2
-rw-r--r--lib/chef/resource/rhsm_subscription.rb2
5 files changed, 9 insertions, 0 deletions
diff --git a/lib/chef/resource/rhsm_errata.rb b/lib/chef/resource/rhsm_errata.rb
index 15b6dab8bc..11aa49c34a 100644
--- a/lib/chef/resource/rhsm_errata.rb
+++ b/lib/chef/resource/rhsm_errata.rb
@@ -37,6 +37,7 @@ class Chef
execute "Install errata packages for #{new_resource.errata_id}" do
command "yum update --advisory #{new_resource.errata_id} -y"
+ default_env true
action :run
end
end
diff --git a/lib/chef/resource/rhsm_errata_level.rb b/lib/chef/resource/rhsm_errata_level.rb
index ee94a3e60f..baf1abfc9c 100644
--- a/lib/chef/resource/rhsm_errata_level.rb
+++ b/lib/chef/resource/rhsm_errata_level.rb
@@ -44,6 +44,7 @@ class Chef
execute "Install any #{new_resource.errata_level} errata" do
command "yum update --sec-severity=#{new_resource.errata_level.capitalize} -y"
+ default_env true
action :run
end
end
diff --git a/lib/chef/resource/rhsm_register.rb b/lib/chef/resource/rhsm_register.rb
index f0c86ccaac..cf1a131c44 100644
--- a/lib/chef/resource/rhsm_register.rb
+++ b/lib/chef/resource/rhsm_register.rb
@@ -87,6 +87,7 @@ class Chef
execute "Register to RHSM" do
sensitive new_resource.sensitive
command register_command
+ default_env true
action :run
not_if { registered_with_rhsm? } unless new_resource.force
end
@@ -102,6 +103,7 @@ class Chef
execute "Unregister from RHSM" do
command "subscription-manager unregister"
+ default_env true
action :run
only_if { registered_with_rhsm? }
notifies :run, "execute[Clean RHSM Config]", :immediately
@@ -109,6 +111,7 @@ class Chef
execute "Clean RHSM Config" do
command "subscription-manager clean"
+ default_env true
action :nothing
end
end
diff --git a/lib/chef/resource/rhsm_repo.rb b/lib/chef/resource/rhsm_repo.rb
index 54f829e79e..86857be211 100644
--- a/lib/chef/resource/rhsm_repo.rb
+++ b/lib/chef/resource/rhsm_repo.rb
@@ -36,6 +36,7 @@ class Chef
execute "Enable repository #{new_resource.repo_name}" do
command "subscription-manager repos --enable=#{new_resource.repo_name}"
+ default_env true
action :run
not_if { repo_enabled?(new_resource.repo_name) }
end
@@ -46,6 +47,7 @@ class Chef
execute "Enable repository #{new_resource.repo_name}" do
command "subscription-manager repos --disable=#{new_resource.repo_name}"
+ default_env true
action :run
only_if { repo_enabled?(new_resource.repo_name) }
end
diff --git a/lib/chef/resource/rhsm_subscription.rb b/lib/chef/resource/rhsm_subscription.rb
index 1f6eb9edee..f00f801afa 100644
--- a/lib/chef/resource/rhsm_subscription.rb
+++ b/lib/chef/resource/rhsm_subscription.rb
@@ -37,6 +37,7 @@ class Chef
execute "Attach subscription pool #{new_resource.pool_id}" do
command "subscription-manager attach --pool=#{new_resource.pool_id}"
+ default_env true
action :run
not_if { subscription_attached?(new_resource.pool_id) }
end
@@ -47,6 +48,7 @@ class Chef
execute "Remove subscription pool #{new_resource.pool_id}" do
command "subscription-manager remove --serial=#{pool_serial(new_resource.pool_id)}"
+ default_env true
action :run
only_if { subscription_attached?(new_resource.pool_id) }
end