Remove suppport for EL6

According to metadata.json we no longer supported this so we can
simplify.

manifests/init.pp

@@ -32,7 +32,7 @@
 # $db_password::                  The Candlepin database password;
 #                                 default 'candlepin'
 #
-# $tomcat::                       The system tomcat to use, tomcat6 on RHEL6 and tomcat on most Fedoras
+# $tomcat::                       The system tomcat to use
 #
 # $crl_file::                     The Certificate Revocation File for Candlepin
 #

manifests/params.pp

@@ -1,15 +1,6 @@
 # Candlepin params
 class candlepin::params {
-  $tomcat = $::osfamily ? {
-    /^(RedHat|Linux)/ => $::operatingsystem ? {
-      'Fedora'  => 'tomcat',
-      default   => $::operatingsystemrelease ? {
-        /^7\./  => 'tomcat',
-        default => 'tomcat6'
-      }
-    },
-    default => 'tomcat'
-  }
+  $tomcat = 'tomcat'
 
   $ssl_port = 8443
 

manifests/service.pp

@@ -6,7 +6,6 @@
     enable     => true,
     hasstatus  => true,
     hasrestart => true,
-    require    => [Service[$candlepin::db_type]],
   }
 
   if $candlepin::run_init == true {

spec/classes/candlepin_config_spec.rb

@@ -4,7 +4,6 @@
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) { facts }
-      let(:tomcat_name) { os.include?('-6-') ? 'tomcat6' : 'tomcat' }
 
       describe 'without parameters' do
         let :pre_condition do
@@ -92,7 +91,7 @@
         end
 
         it "should setup the tomcat config file" do
-          should contain_file("/etc/#{tomcat_name}/server.xml").
+          should contain_file("/etc/tomcat/server.xml").
             with_content(/^    <Connector port="9070" protocol="HTTP\/1.1" SSLEnabled="true"/).
             with({})
         end

spec/classes/candlepin_spec.rb

@@ -4,13 +4,13 @@
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) { facts }
-      let(:tomcat_name) { os.include?('-6-') ? 'tomcat6' : 'tomcat' }
 
+      it { should compile.with_all_deps }
       it { should contain_class('candlepin::install') }
       it { should contain_class('candlepin::config') }
       it { should contain_class('candlepin::database') }
       it { should contain_class('candlepin::service') }
-      it { should contain_service(tomcat_name).with_ensure('running') }
+      it { should contain_service('tomcat').with_ensure('running') }
     end
   end
 end