diff --git a/manifests/params.pp b/manifests/params.pp index 502ebef5..c263df46 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -2,9 +2,8 @@ # class aodh::params { include openstacklib::defaults - $pyvers = $::openstacklib::defaults::pyvers - $client_package_name = "python${pyvers}-aodhclient" + $client_package_name = 'python3-aodhclient' $group = 'aodh' $expirer_command = 'aodh-expirer' @@ -23,7 +22,7 @@ class aodh::params { $listener_service_name = 'openstack-aodh-listener' $aodh_wsgi_script_dir = '/var/www/cgi-bin/aodh' $aodh_wsgi_script_source = '/usr/bin/aodh-api' - $redis_package_name = "python${pyvers}-redis" + $redis_package_name = 'python3-redis' } 'Debian': { $common_package_name = 'aodh-common' @@ -46,7 +45,7 @@ class aodh::params { $listener_service_name = 'aodh-listener' $aodh_wsgi_script_dir = '/usr/lib/cgi-bin/aodh' $aodh_wsgi_script_source = '/usr/share/aodh/app.wsgi' - $redis_package_name = "python${pyvers}-redis" + $redis_package_name = 'python3-redis' } default: { fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, \ diff --git a/spec/classes/aodh_client_spec.rb b/spec/classes/aodh_client_spec.rb index 5fe3366e..4a407f9b 100644 --- a/spec/classes/aodh_client_spec.rb +++ b/spec/classes/aodh_client_spec.rb @@ -10,7 +10,7 @@ describe 'aodh::client' do it 'installs aodh client package' do is_expected.to contain_package('python-aodhclient').with( :ensure => 'present', - :name => platform_params[:client_package_name], + :name => 'python3-aodhclient', :tag => 'openstack', ) end @@ -31,15 +31,7 @@ describe 'aodh::client' do when 'Debian' { :client_package_name => 'python3-aodhclient' } when 'RedHat' - if facts[:operatingsystem] == 'Fedora' - { :client_package_name => 'python3-aodhclient' } - else - if facts[:operatingsystemmajrelease] > '7' - { :client_package_name => 'python3-aodhclient' } - else - { :client_package_name => 'python-aodhclient' } - end - end + { :client_package_name => 'python3-aodhclient' } end end