diff --git a/manifests/params.pp b/manifests/params.pp index 80efd021..65aec414 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -2,15 +2,8 @@ # should be considered to be constant class glance::params { include ::openstacklib::defaults + $pyvers = $::openstacklib::defaults::pyvers - if ($::os_package_type == 'debian') or ($::operatingsystem == 'Fedora') or - ($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) { - $pyvers = '3' - $_pyceph_package_name = 'python3-rbd' - } else { - $pyvers = '' - $_pyceph_package_name = 'python-rbd' - } $client_package_name = "python${pyvers}-glanceclient" $cache_cleaner_command = 'glance-cache-cleaner' @@ -26,7 +19,7 @@ class glance::params { if ($::operatingsystem != 'fedora' and versioncmp($::operatingsystemrelease, '7') < 0) { $pyceph_package_name = 'python-ceph' } else { - $pyceph_package_name = $_pyceph_package_name + $pyceph_package_name = "python${pyvers}-rbd" } } 'Debian': { diff --git a/spec/classes/glance_backend_rbd_spec.rb b/spec/classes/glance_backend_rbd_spec.rb index 77b8da04..db09ea72 100644 --- a/spec/classes/glance_backend_rbd_spec.rb +++ b/spec/classes/glance_backend_rbd_spec.rb @@ -82,13 +82,8 @@ describe 'glance::backend::rbd' do let(:platform_params) do case facts[:osfamily] when 'Debian' - if facts[:os_package_type] == 'debian' then - pyceph_pkg = 'python3-ceph' - else - pyceph_pkg = 'python-ceph' - end { - :pyceph_package_name => pyceph_pkg, + :pyceph_package_name => 'python3-ceph', } when 'RedHat' { diff --git a/spec/classes/glance_client_spec.rb b/spec/classes/glance_client_spec.rb index 4cfac09e..1b537837 100644 --- a/spec/classes/glance_client_spec.rb +++ b/spec/classes/glance_client_spec.rb @@ -23,11 +23,7 @@ describe 'glance::client' do let(:platform_params) do case facts[:osfamily] when 'Debian' - if facts[:os_package_type] == 'debian' - { :client_package_name => 'python3-glanceclient' } - else - { :client_package_name => 'python-glanceclient' } - end + { :client_package_name => 'python3-glanceclient' } when 'RedHat' if facts[:operatingsystem] == 'Fedora' { :client_package_name => 'python3-glanceclient' }