diff --git a/manifests/params.pp b/manifests/params.pp index 65aec414..3478a03a 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -27,7 +27,11 @@ class glance::params { $registry_package_name = 'glance-registry' $api_service_name = 'glance-api' $registry_service_name = 'glance-registry' - $pyceph_package_name = "python${pyvers}-ceph" + if $::os_package_type == 'debian' { + $pyceph_package_name = "python${pyvers}-ceph" + } else { + $pyceph_package_name = "python${pyvers}-rbd" + } } default: { fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, \ diff --git a/releasenotes/notes/glance-rbd-ubuntu-package-b072d00a7e21b9af.yaml b/releasenotes/notes/glance-rbd-ubuntu-package-b072d00a7e21b9af.yaml new file mode 100644 index 00000000..688e7939 --- /dev/null +++ b/releasenotes/notes/glance-rbd-ubuntu-package-b072d00a7e21b9af.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + The glance::backend::rbd class now install python-rbd/python3-rbd package + instead of the python-ceph meta package on Ubuntu. diff --git a/spec/classes/glance_backend_rbd_spec.rb b/spec/classes/glance_backend_rbd_spec.rb index db09ea72..0f32a1a3 100644 --- a/spec/classes/glance_backend_rbd_spec.rb +++ b/spec/classes/glance_backend_rbd_spec.rb @@ -82,13 +82,13 @@ describe 'glance::backend::rbd' do let(:platform_params) do case facts[:osfamily] when 'Debian' - { - :pyceph_package_name => 'python3-ceph', - } + if facts[:os_package_type] == 'debian' + { :pyceph_package_name => 'python3-ceph' } + else + { :pyceph_package_name => 'python3-rbd' } + end when 'RedHat' - { - :pyceph_package_name => 'python-rbd', - } + { :pyceph_package_name => 'python-rbd' } end end