Use python3 packages on Ubuntu

Python2.7 is going EOL soon, let us deploy python3 for Rocky from the
start, so we avoid having to switch later.

Clean up some unused pkg attributes.

Depends-On: https://review.opendev.org/682918
Change-Id: I1a11352f54b4126d7b510aa74d9ed1c4a33348c1
This commit is contained in:
Jens Harbott 2019-09-18 10:48:20 +00:00 committed by Jens Harbott (frickler)
parent 11ee82bb4d
commit a47fa16dd1
5 changed files with 14 additions and 20 deletions

View File

@ -97,32 +97,24 @@ when 'rhel' # :pragma-foodcritic: ~FC024 - won't fix this
'cinder_backup_service' => 'openstack-cinder-backup',
'cinder_iscsitarget_packages' => ['targetcli', 'dbus-python'],
'cinder_iscsitarget_service' => 'target',
'cinder_nfs_packages' => ['nfs-utils', 'nfs-utils-lib'],
'cinder_emc_packages' => ['pywbem'],
'cinder_svc_packages' => ['sysfsutils'],
'cinder_lvm_packages' => ['lvm2'],
'cinder_flashsystem_packages' => ['sysfsutils'],
'package_overrides' => '',
}
when 'debian'
# operating system user and group names
default['openstack']['block-storage']['platform'] = {
'cinder_common_packages' => ['cinder-common'],
'cinder_api_packages' => ['cinder-api'],
'cinder_api_packages' => ['libapache2-mod-wsgi-py3', 'python3-cinder', 'cinder-api'],
'cinder_api_service' => 'cinder-api',
'cinder_volume_packages' => ['cinder-volume', 'qemu-utils', 'thin-provisioning-tools'],
'cinder_volume_packages' => ['python3-cinder', 'cinder-volume', 'qemu-utils', 'thin-provisioning-tools'],
'cinder_volume_service' => 'cinder-volume',
'cinder_scheduler_packages' => ['cinder-scheduler'],
'cinder_scheduler_packages' => ['python3-cinder', 'cinder-scheduler'],
'cinder_scheduler_service' => 'cinder-scheduler',
'cinder_backup_packages' => ['cinder-backup'],
'cinder_backup_packages' => ['python3-cinder', 'cinder-backup'],
'cinder_backup_service' => 'cinder-backup',
'cinder_iscsitarget_packages' => ['targetcli-fb'],
'cinder_iscsitarget_service' => 'tgt',
'cinder_nfs_packages' => ['nfs-common'],
'cinder_emc_packages' => ['python-pywbem'],
'cinder_svc_packages' => ['sysfsutils'],
'cinder_lvm_packages' => ['lvm2'],
'cinder_flashsystem_packages' => ['sysfsutils'],
'package_overrides' => '',
}
end

View File

@ -43,11 +43,13 @@ describe 'openstack-block-storage::api' do
end
it 'upgrades cinder api packages' do
expect(chef_run).to upgrade_package('libapache2-mod-wsgi-py3')
expect(chef_run).to upgrade_package('python3-cinder')
expect(chef_run).to upgrade_package('cinder-api')
end
it 'upgrades mysql python package' do
expect(chef_run).to upgrade_package('python-mysqldb')
it 'upgrades mysql python3 package' do
expect(chef_run).to upgrade_package('python3-mysqldb')
end
it 'runs db migrations' do

View File

@ -29,8 +29,8 @@ describe 'openstack-block-storage::backup' do
expect(chef_run.service('cinder-backup')).to subscribe_to('template[/etc/cinder/cinder.conf]')
end
it 'upgrades mysql python package' do
expect(chef_run).to upgrade_package 'python-mysqldb'
it 'upgrades mysql python3 package' do
expect(chef_run).to upgrade_package 'python3-mysqldb'
end
end
end

View File

@ -26,8 +26,8 @@ describe 'openstack-block-storage::scheduler' do
expect(chef_run).to enable_service 'cinder-scheduler'
end
it 'upgrades mysql python package' do
expect(chef_run).to upgrade_package 'python-mysqldb'
it 'upgrades mysql python3 package' do
expect(chef_run).to upgrade_package 'python3-mysqldb'
end
end
end

View File

@ -38,8 +38,8 @@ describe 'openstack-block-storage::volume' do
expect(chef_run).to enable_service 'iscsitarget'
end
it 'upgrades mysql python packages by default' do
expect(chef_run).to upgrade_package 'python-mysqldb'
it 'upgrades mysql python3 packages by default' do
expect(chef_run).to upgrade_package 'python3-mysqldb'
end
it 'upgrades cinder iscsi package' do