From 99eea96d5d13005c9bbf8b809ae9bb1bc200645f Mon Sep 17 00:00:00 2001 From: Justin Sherrill Date: Wed, 3 Feb 2016 19:10:53 -0500 Subject: [PATCH] stop installing candlepin-tomcat* --- manifests/install.pp | 2 +- spec/classes/candlepin_install_spec.rb | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/manifests/install.pp b/manifests/install.pp index c14f2b6..0a1af7e 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -1,6 +1,6 @@ # Candlepin installation packages class candlepin::install { - package { ['candlepin', "candlepin-${candlepin::tomcat}"]: + package { ['candlepin']: ensure => $candlepin::version, } diff --git a/spec/classes/candlepin_install_spec.rb b/spec/classes/candlepin_install_spec.rb index 51189a8..2ec6fa5 100644 --- a/spec/classes/candlepin_install_spec.rb +++ b/spec/classes/candlepin_install_spec.rb @@ -18,7 +18,6 @@ end it { should contain_package('candlepin').with('ensure' => 'present') } - it { should contain_package('candlepin-tomcat6').with('ensure' => 'present') } end context 'on el7' do @@ -37,6 +36,5 @@ end it { should contain_package('candlepin').with('ensure' => 'present') } - it { should contain_package('candlepin-tomcat').with('ensure' => 'present') } end end