From d99927c4c1cdd2113ac77c30dae3c2141d730469 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kolbj=C3=B8rn=20Barmen?= Date: Thu, 1 Mar 2018 21:59:21 +0100 Subject: [PATCH] Revert "(PUP-8495) Systemd support, Ubuntu 17.04 and 17.10" This reverts commit 8a38dbfcb8ef965ce598351e5f6812f38a1c3a63. --- lib/puppet/provider/service/systemd.rb | 2 +- spec/unit/provider/service/systemd_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/puppet/provider/service/systemd.rb b/lib/puppet/provider/service/systemd.rb index 26179ad21f2..1c864040c1a 100644 --- a/lib/puppet/provider/service/systemd.rb +++ b/lib/puppet/provider/service/systemd.rb @@ -25,7 +25,7 @@ defaultfor :osfamily => :coreos defaultfor :operatingsystem => :amazon, :operatingsystemmajrelease => ["2"] defaultfor :operatingsystem => :debian, :operatingsystemmajrelease => ["8", "stretch/sid", "9", "buster/sid"] - defaultfor :operatingsystem => :ubuntu, :operatingsystemmajrelease => ["15.04","15.10","16.04","16.10","17.04","17.10"] + defaultfor :operatingsystem => :ubuntu, :operatingsystemmajrelease => ["15.04","15.10","16.04","16.10"] defaultfor :operatingsystem => :cumuluslinux, :operatingsystemmajrelease => ["3"] def self.instances diff --git a/spec/unit/provider/service/systemd_spec.rb b/spec/unit/provider/service/systemd_spec.rb index 797bef3bdb3..7e92b209054 100644 --- a/spec/unit/provider/service/systemd_spec.rb +++ b/spec/unit/provider/service/systemd_spec.rb @@ -126,7 +126,7 @@ expect(described_class).not_to be_default end - [ '15.04', '15.10', '16.04', '16.10', '17.04', '17.10' ].each do |ver| + [ '15.04', '15.10', '16.04', '16.10' ].each do |ver| it "should be the default provider on ubuntu#{ver}" do Facter.stubs(:value).with(:osfamily).returns(:debian) Facter.stubs(:value).with(:operatingsystem).returns(:ubuntu)