diff --git a/Gemfile b/Gemfile index 1eed87a0..7de2f252 100644 --- a/Gemfile +++ b/Gemfile @@ -51,7 +51,6 @@ group :development, :release_prep do gem "puppetlabs_spec_helper", '~> 7.0', require: false end group :system_tests do - gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw] gem "CFPropertyList", '< 3.0.7', require: false, platforms: [:mswin, :mingw, :x64_mingw] gem "serverspec", '~> 2.41', require: false gem "voxpupuli-acceptance", '~> 3', require: false diff --git a/manifests/osfamily/debian.pp b/manifests/osfamily/debian.pp index 3cc2f525..5138c61d 100644 --- a/manifests/osfamily/debian.pp +++ b/manifests/osfamily/debian.pp @@ -60,13 +60,11 @@ # Pass in an empty content string since apt requires it even though we are removing it apt::setting { 'list-puppet-enterprise-installer': ensure => absent, - content => '', } apt::setting { 'conf-pe-repo': ensure => absent, priority => '90', - content => '', } } else { $source = $puppet_agent::apt_source diff --git a/spec/classes/puppet_agent_osfamily_debian_spec.rb b/spec/classes/puppet_agent_osfamily_debian_spec.rb index 3601dd39..bf42425c 100644 --- a/spec/classes/puppet_agent_osfamily_debian_spec.rb +++ b/spec/classes/puppet_agent_osfamily_debian_spec.rb @@ -58,7 +58,6 @@ is_expected.to contain_apt__setting('conf-pe-repo') .with({ 'priority' => 90, - 'content' => '', 'ensure' => 'absent', }) } @@ -66,8 +65,7 @@ it { is_expected.to contain_apt__setting('list-puppet-enterprise-installer') .with({ - 'content' => '', - 'ensure' => 'absent', + 'ensure' => 'absent', }) } end