Skip to content

Commit 686d5ca

Browse files
committed
(PUP-6381) Use systemd default service provider for Cumulus 3
1 parent 16d4442 commit 686d5ca

File tree

4 files changed

+19
-8
lines changed

4 files changed

+19
-8
lines changed

lib/puppet/provider/service/debian.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
commands :invoke_rc => "/usr/sbin/invoke-rc.d"
1818
commands :service => "/usr/sbin/service"
1919

20-
defaultfor :operatingsystem => :cumuluslinux
20+
defaultfor :operatingsystem => :cumuluslinux, :operatingsystemmajrelease => ['1','2']
2121
defaultfor :operatingsystem => :debian, :operatingsystemmajrelease => ['5','6','7']
2222

2323
# Remove the symlinks

lib/puppet/provider/service/systemd.rb

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
defaultfor :osfamily => :suse
2525
defaultfor :operatingsystem => :debian, :operatingsystemmajrelease => "8"
2626
defaultfor :operatingsystem => :ubuntu, :operatingsystemmajrelease => ["15.04","15.10","16.04","16.10"]
27+
defaultfor :operatingsystem => :cumuluslinux, :operatingsystemmajrelease => ["3"]
2728

2829
def self.instances
2930
i = []

spec/unit/provider/service/debian_spec.rb

+10-7
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,20 @@
3333
@provider.stubs(:invoke_rc)
3434
end
3535

36-
operatingsystem = [ 'Debian', 'CumulusLinux' ]
37-
operatingsystem.each do |os|
38-
it "should be the default provider on #{os}" do
39-
Facter.expects(:value).with(:operatingsystem).at_least_once.returns(os)
40-
if os == 'Debian'
41-
Facter.expects(:value).with(:operatingsystemmajrelease).returns('7')
42-
end
36+
['1','2'].each do |version|
37+
it "should be the default provider on CumulusLinux #{version}" do
38+
Facter.expects(:value).with(:operatingsystem).at_least_once.returns('CumulusLinux')
39+
Facter.expects(:value).with(:operatingsystemmajrelease).returns(version)
4340
expect(provider_class.default?).to be_truthy
4441
end
4542
end
4643

44+
it "should be the default provider on Debian" do
45+
Facter.expects(:value).with(:operatingsystem).at_least_once.returns('Debian')
46+
Facter.expects(:value).with(:operatingsystemmajrelease).returns('7')
47+
expect(provider_class.default?).to be_truthy
48+
end
49+
4750
it "should have an enabled? method" do
4851
expect(@provider).to respond_to(:enabled?)
4952
end

spec/unit/provider/service/systemd_spec.rb

+7
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,13 @@
5151
end
5252
end
5353

54+
it "should be the default provider on cumulus3" do
55+
Facter.stubs(:value).with(:osfamily).returns(:debian)
56+
Facter.stubs(:value).with(:operatingsystem).returns('CumulusLinux')
57+
Facter.stubs(:value).with(:operatingsystemmajrelease).returns("3")
58+
expect(described_class).to be_default
59+
end
60+
5461
it "should be the default provider on sles12" do
5562
Facter.stubs(:value).with(:osfamily).returns(:suse)
5663
Facter.stubs(:value).with(:operatingsystemmajrelease).returns("12")

0 commit comments

Comments
 (0)