diff --git a/attributes/default.rb b/attributes/default.rb index f737f3d9..5e4839f5 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -79,35 +79,33 @@ when 'rhel' # :pragma-foodcritic: ~FC024 - won't fix this } when 'debian' default['openstack']['compute']['platform'] = { - 'api_os_compute_packages' => ['nova-api'], + 'api_os_compute_packages' => ['python3-nova', 'nova-api'], 'api_os_compute_service' => 'nova-api', - 'api_placement_packages' => ['nova-placement-api'], + 'api_placement_packages' => ['python3-nova', 'libapache2-mod-wsgi-py3', 'nova-placement-api'], 'api_placement_service' => 'nova-placement-api', - 'memcache_python_packages' => ['python-memcache'], - 'compute_api_metadata_packages' => ['nova-api-metadata'], + 'memcache_python_packages' => ['python3-memcache'], + 'compute_api_metadata_packages' => ['python3-nova', 'nova-api-metadata'], 'compute_api_metadata_service' => 'nova-api-metadata', - 'compute_compute_packages' => ['nova-compute'], - 'qemu_compute_packages' => ['nova-compute-qemu'], - 'kvm_compute_packages' => ['nova-compute-kvm'], + 'compute_compute_packages' => ['python3-nova', 'nova-compute'], + 'qemu_compute_packages' => ['python3-nova', 'nova-compute-qemu'], + 'kvm_compute_packages' => ['python3-nova', 'nova-compute-kvm'], 'compute_compute_service' => 'nova-compute', - 'compute_scheduler_packages' => ['nova-scheduler'], + 'compute_scheduler_packages' => ['python3-nova', 'nova-scheduler'], 'compute_scheduler_service' => 'nova-scheduler', - 'compute_conductor_packages' => ['nova-conductor'], + 'compute_conductor_packages' => ['python3-nova', 'nova-conductor'], 'compute_conductor_service' => 'nova-conductor', # Websockify is needed due to https://bugs.launchpad.net/ubuntu/+source/nova/+bug/1076442 - 'compute_vncproxy_packages' => ['novnc', 'websockify', 'nova-novncproxy'], + 'compute_vncproxy_packages' => ['novnc', 'websockify', 'python3-nova', 'nova-novncproxy'], 'compute_vncproxy_service' => 'nova-novncproxy', - 'compute_vncproxy_consoleauth_packages' => ['nova-consoleauth'], + 'compute_vncproxy_consoleauth_packages' => ['python3-nova', 'nova-consoleauth'], 'compute_vncproxy_consoleauth_service' => 'nova-consoleauth', - 'compute_serialproxy_packages' => ['nova-serialproxy'], + 'compute_serialproxy_packages' => ['python3-nova', 'nova-serialproxy'], 'compute_serialproxy_service' => 'nova-serialproxy', - 'libvirt_packages' => ['libvirt-bin', 'python-guestfs'], + 'libvirt_packages' => ['libvirt-bin', 'python3-guestfs'], 'libvirt_service' => 'libvirt-bin', 'dbus_service' => 'dbus', - 'compute_cert_packages' => ['nova-cert'], - 'compute_cert_service' => 'nova-cert', 'mysql_service' => 'mysql', - 'common_packages' => ['nova-common', 'python-nova'], + 'common_packages' => ['nova-common', 'python3-nova'], 'iscsi_helper' => 'tgtadm', 'volume_packages' => ['sysfsutils', 'sg3-utils', 'multipath-tools'], 'package_overrides' => '', diff --git a/spec/libvirt_spec.rb b/spec/libvirt_spec.rb index 010ec712..d32c845b 100644 --- a/spec/libvirt_spec.rb +++ b/spec/libvirt_spec.rb @@ -11,7 +11,7 @@ describe 'openstack-compute::libvirt' do include_context 'compute_stubs' it 'upgrades libvirt packages' do - %w(libvirt-bin python-guestfs).each do |pkg| + %w(libvirt-bin python3-guestfs).each do |pkg| expect(chef_run).to upgrade_package pkg end end diff --git a/spec/nova-common_spec.rb b/spec/nova-common_spec.rb index 40b8d2c4..79db923b 100644 --- a/spec/nova-common_spec.rb +++ b/spec/nova-common_spec.rb @@ -19,16 +19,16 @@ describe 'openstack-compute::nova-common' do include_examples 'expect_creates_nova_state_dir' include_examples 'expect_creates_nova_lock_dir' - 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 'upgrades nova common package' do expect(chef_run).to upgrade_package 'nova-common' end - it 'upgrades memcache python package' do - expect(chef_run).to upgrade_package 'python-memcache' + it 'upgrades memcache python3 package' do + expect(chef_run).to upgrade_package 'python3-memcache' end it 'creates the /etc/nova directory' do