From: Lukas Bezdicka <lbezdick@redhat.com>
Date: Fri, 19 Dec 2014 12:04:04 +0000 (+0100)
Subject: Deprecate support for Fedora 18
X-Git-Tag: 6.0.0~41^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=a0b8d10f2628bd0212d3de54e7ebf7a05f0c8333;p=puppet-modules%2Fpuppet-ceilometer.git

Deprecate support for Fedora 18

Also fixes error on Rawhide: Error: comparison of String with 18.
Package python-sqlite2 is deprecated since F18. F19 is also EOL.
https://fedoraproject.org/wiki/End_of_life

Change-Id: Id59fd02af92c6d77d49195001fc4f983d66d29dd
---

diff --git a/manifests/params.pp b/manifests/params.pp
index b91ef57..1d34bd2 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -27,18 +27,9 @@ class ceilometer::params {
       $pymongo_package_name            = 'python-pymongo'
       $psycopg_package_name            = 'python-psycopg2'
       $agent_notification_service_name = 'openstack-ceilometer-notification'
-
-      # db packages
-      if $::operatingsystem == 'Fedora' and $::operatingsystemrelease >= 18 {
-        # fallback to stdlib version, not provided on fedora
-        $sqlite_package_name      = undef
-      } else {
-        $sqlite_package_name      = 'python-sqlite2'
-      }
-
-      $ceilometer_wsgi_script_path    = '/var/www/cgi-bin/ceilometer'
-      $ceilometer_wsgi_script_source  = '/usr/lib/python2.7/site-packages/ceilometer/api/app.wsgi'
-
+      $ceilometer_wsgi_script_path     = '/var/www/cgi-bin/ceilometer'
+      $ceilometer_wsgi_script_source   = '/usr/lib/python2.7/site-packages/ceilometer/api/app.wsgi'
+      $sqlite_package_name             = undef
     }
     'Debian': {
       # package names
diff --git a/spec/classes/ceilometer_db_spec.rb b/spec/classes/ceilometer_db_spec.rb
index f652658..8ba9492 100644
--- a/spec/classes/ceilometer_db_spec.rb
+++ b/spec/classes/ceilometer_db_spec.rb
@@ -34,12 +34,11 @@ describe 'ceilometer::db' do
     end
   end
 
-  # Fedora > 18 has python-pymongo too
   context 'on Redhat platforms' do
     let :facts do
       { :osfamily => 'Redhat',
         :operatingsystem => 'Fedora',
-        :operatingsystemrelease => 18
+        :operatingsystemrelease => 21
       }
     end
 
@@ -119,9 +118,6 @@ describe 'ceilometer::db' do
     it { should contain_class('ceilometer::params') }
 
     it 'installs pymongo package' do
-      should contain_package('ceilometer-backend-package').with(
-        :ensure => 'present',
-        :name => 'python-sqlite2')
       should contain_ceilometer_config('database/connection').with_value('sqlite:///var/lib/ceilometer.db')
       should contain_ceilometer_config('database/connection').with_value( params[:database_connection] ).with_secret(true)
     end