Add missing patches

epel9
Haikel Guemar 6 years ago
parent 177186787b
commit f6d76875bb

@ -0,0 +1,25 @@
From d88bbce5af8a35d2bdf74632ef2dcd0dae8e178c Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Wed, 15 Aug 2018 22:40:35 +0200
Subject: [PATCH] (PUP-9069) Add support for RHEL8
This adds support for the next version of RHEL in the systemd provider.
Note: I have no idea when it'll be released but we need this patch as we
need to make Puppet systemd provider working.
---
lib/puppet/provider/service/systemd.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/puppet/provider/service/systemd.rb b/lib/puppet/provider/service/systemd.rb
index 8dd7af21e61..2371a14acb4 100644
--- a/lib/puppet/provider/service/systemd.rb
+++ b/lib/puppet/provider/service/systemd.rb
@@ -19,7 +19,7 @@
end
defaultfor :osfamily => [:archlinux]
- defaultfor :osfamily => :redhat, :operatingsystemmajrelease => "7"
+ defaultfor :osfamily => :redhat, :operatingsystemmajrelease => ["7", "8"]
defaultfor :osfamily => :redhat, :operatingsystem => :fedora
defaultfor :osfamily => :suse
defaultfor :osfamily => :coreos

@ -0,0 +1,49 @@
From 7ae809e1eaa826082c9f587f8741ea50f5246034 Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Wed, 3 Oct 2018 12:55:30 -0600
Subject: [PATCH] (PUP-9198) Add RHEL8 support in the dnf provider
dnf should be the default for RHEL8
---
lib/puppet/provider/package/dnf.rb | 1 +
spec/unit/provider/package/dnf_spec.rb | 15 +++++++++++++++
2 files changed, 16 insertions(+)
diff --git a/lib/puppet/provider/package/dnf.rb b/lib/puppet/provider/package/dnf.rb
index 535aa6c6d7f..4823ebfd523 100644
--- a/lib/puppet/provider/package/dnf.rb
+++ b/lib/puppet/provider/package/dnf.rb
@@ -29,6 +29,7 @@
end
defaultfor :operatingsystem => :fedora, :operatingsystemmajrelease => (22..30).to_a
+ defaultfor :osfamily => :redhat, :operatingsystemmajrelease => ["8"]
def self.update_command
# In DNF, update is deprecated for upgrade
diff --git a/spec/unit/provider/package/dnf_spec.rb b/spec/unit/provider/package/dnf_spec.rb
index 5e57337f500..40345dcde6e 100644
--- a/spec/unit/provider/package/dnf_spec.rb
+++ b/spec/unit/provider/package/dnf_spec.rb
@@ -23,6 +23,21 @@
expect(provider_class).to be_default
end
end
+
+ it "should not be the default provider on rhel7" do
+ Facter.stubs(:value).with(:osfamily).returns(:redhat)
+ Facter.stubs(:value).with(:operatingsystem).returns(:redhat)
+ Facter.stubs(:value).with(:operatingsystemmajrelease).returns("7")
+ expect(provider_class).to_not be_default
+ end
+
+ it "should be the default provider on rhel8" do
+ Facter.stubs(:value).with(:osfamily).returns(:redhat)
+ Facter.stubs(:value).with(:operatingsystem).returns(:redhat)
+ Facter.stubs(:value).with(:operatingsystemmajrelease).returns("8")
+ expect(provider_class).to be_default
+ end
+
end
describe provider_class do
Loading…
Cancel
Save