openstack/cookbook-openstack-common
Code Issues Proposed changes

Merge "Use python3 packages on Ubuntu"

Browse Source
This commit is contained in:
Zuul
2019-11-25 14:58:42 +00:00
committed by Gerrit Code Review
parent cace34613e d0c2aa8fba
commit eb503b66ad
5 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
attributes/database.rb
View File

@@ -128,10 +128,10 @@ when 'rhel'
default['openstack']['db']['python_packages']['galera'] = ['MySQL-python'] default['openstack']['db']['python_packages']['galera'] = ['MySQL-python']
when 'debian' when 'debian'
default['openstack']['db']['service_type'] = 'mariadb' default['openstack']['db']['service_type'] = 'mariadb'
default['openstack']['db']['python_packages']['mysql'] = ['python-mysqldb'] default['openstack']['db']['python_packages']['mysql'] = ['python3-mysqldb']
default['openstack']['db']['python_packages']['mariadb'] = ['python-mysqldb'] default['openstack']['db']['python_packages']['mariadb'] = ['python3-mysqldb']
default['openstack']['db']['python_packages']['percona-cluster'] = ['python-mysqldb'] default['openstack']['db']['python_packages']['percona-cluster'] = ['python3-mysqldb']
default['openstack']['db']['python_packages']['galera'] = ['python-mysqldb'] default['openstack']['db']['python_packages']['galera'] = ['python3-mysqldb']
end end
# database sockets, because different # database sockets, because different

19
attributes/default.rb
View File

@@ -292,7 +292,7 @@ case node['platform_family']
when 'rhel' when 'rhel'
default['openstack']['common']['platform'] = { default['openstack']['common']['platform'] = {
'common_client_packages' => ['python-openstackclient'], 'common_client_packages' => ['python-openstackclient'],
'python2_packages' => [ 'python_packages' => [
'python', 'python',
'python2-pip', 'python2-pip',
'python2-setuptools', 'python2-setuptools',
@@ -304,14 +304,15 @@ when 'rhel'
} }
when 'debian' when 'debian'
default['openstack']['common']['platform'] = { default['openstack']['common']['platform'] = {
'common_client_packages' => ['python-openstackclient'], 'common_client_packages' => ['python3-openstackclient'],
'python2_packages' => [ 'python_packages' => [
'python', 'python3',
'python-dev', 'python3-dev',
'python-pip', 'python3-pip',
'python-setuptools', 'python3-setuptools',
'python-virtualenv', 'python3-virtualenv',
'python-wheel', 'python3-wheel',
'virtualenv',
], ],
'package_overrides' => '', 'package_overrides' => '',
} }

2
recipes/default.rb
View File

@@ -113,7 +113,7 @@ when 'rhel'
end end
# install a python # install a python
package node['openstack']['common']['platform']['python2_packages'] do package node['openstack']['common']['platform']['python_packages'] do
options platform_options['package_overrides'] options platform_options['package_overrides']
action :upgrade action :upgrade
end end

2
spec/client_spec.rb
View File

@@ -10,7 +10,7 @@ describe 'openstack-common::client' do
end end
it do it do
expect(chef_run).to upgrade_package('python-openstackclient') expect(chef_run).to upgrade_package('python3-openstackclient')
end end
end end
end end

4
spec/default_spec.rb
View File

@@ -62,9 +62,9 @@ describe 'openstack-common::default' do
) )
end 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) expect(chef_run).to upgrade_package(pkgs)
end end