diff --git a/attributes/database.rb b/attributes/database.rb index 6b300cf6..fbc7b17a 100644 --- a/attributes/database.rb +++ b/attributes/database.rb @@ -128,10 +128,10 @@ when 'rhel' default['openstack']['db']['python_packages']['galera'] = ['MySQL-python'] when 'debian' default['openstack']['db']['service_type'] = 'mariadb' - default['openstack']['db']['python_packages']['mysql'] = ['python-mysqldb'] - default['openstack']['db']['python_packages']['mariadb'] = ['python-mysqldb'] - default['openstack']['db']['python_packages']['percona-cluster'] = ['python-mysqldb'] - default['openstack']['db']['python_packages']['galera'] = ['python-mysqldb'] + default['openstack']['db']['python_packages']['mysql'] = ['python3-mysqldb'] + default['openstack']['db']['python_packages']['mariadb'] = ['python3-mysqldb'] + default['openstack']['db']['python_packages']['percona-cluster'] = ['python3-mysqldb'] + default['openstack']['db']['python_packages']['galera'] = ['python3-mysqldb'] end # database sockets, because different diff --git a/attributes/default.rb b/attributes/default.rb index 7c38129e..083fe0d7 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -292,7 +292,7 @@ case node['platform_family'] when 'rhel' default['openstack']['common']['platform'] = { 'common_client_packages' => ['python-openstackclient'], - 'python2_packages' => [ + 'python_packages' => [ 'python', 'python2-pip', 'python2-setuptools', @@ -304,14 +304,15 @@ when 'rhel' } when 'debian' default['openstack']['common']['platform'] = { - 'common_client_packages' => ['python-openstackclient'], - 'python2_packages' => [ - 'python', - 'python-dev', - 'python-pip', - 'python-setuptools', - 'python-virtualenv', - 'python-wheel', + 'common_client_packages' => ['python3-openstackclient'], + 'python_packages' => [ + 'python3', + 'python3-dev', + 'python3-pip', + 'python3-setuptools', + 'python3-virtualenv', + 'python3-wheel', + 'virtualenv', ], 'package_overrides' => '', } diff --git a/recipes/default.rb b/recipes/default.rb index f28656d2..918e2672 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -113,7 +113,7 @@ when 'rhel' end # install a python -package node['openstack']['common']['platform']['python2_packages'] do +package node['openstack']['common']['platform']['python_packages'] do options platform_options['package_overrides'] action :upgrade end diff --git a/spec/client_spec.rb b/spec/client_spec.rb index fff12119..8e9a443f 100644 --- a/spec/client_spec.rb +++ b/spec/client_spec.rb @@ -10,7 +10,7 @@ describe 'openstack-common::client' do end it do - expect(chef_run).to upgrade_package('python-openstackclient') + expect(chef_run).to upgrade_package('python3-openstackclient') end end end diff --git a/spec/default_spec.rb b/spec/default_spec.rb index dc18f908..dd10a429 100644 --- a/spec/default_spec.rb +++ b/spec/default_spec.rb @@ -62,9 +62,9 @@ describe 'openstack-common::default' do ) end - pkgs = %w(python python-dev python-pip python-setuptools python-virtualenv python-wheel) + pkgs = %w(python3 python3-dev python3-pip python3-setuptools python3-virtualenv python3-wheel virtualenv) - it 'installs python2 packages' do + it 'installs python packages' do expect(chef_run).to upgrade_package(pkgs) end