diff --git a/manifests/params.pp b/manifests/params.pp index b91ef5777..1d34bd2c8 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -27,18 +27,9 @@ $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 f6526584e..8ba949280 100644 --- a/spec/classes/ceilometer_db_spec.rb +++ b/spec/classes/ceilometer_db_spec.rb @@ -34,12 +34,11 @@ 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 @@ 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