Merge "Pin setuptools and wheels packages"
This commit is contained in:
commit
f5e211b62b
|
@ -18,13 +18,6 @@
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
#
|
#
|
||||||
|
|
||||||
# install a python
|
|
||||||
python_runtime '2' do
|
|
||||||
provider :system
|
|
||||||
# Workaround for https://github.com/poise/poise-python/issues/133
|
|
||||||
pip_version '18.0'
|
|
||||||
end
|
|
||||||
|
|
||||||
platform_options = node['openstack']['common']['platform']
|
platform_options = node['openstack']['common']['platform']
|
||||||
case node['platform_family']
|
case node['platform_family']
|
||||||
when 'debian'
|
when 'debian'
|
||||||
|
@ -127,6 +120,16 @@ when 'rhel'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# install a python
|
||||||
|
python_runtime '2' do
|
||||||
|
provider :system
|
||||||
|
# Workaround for https://github.com/poise/poise-python/issues/133
|
||||||
|
pip_version '18.0'
|
||||||
|
# Align with eg. OpenStack-Ansible (https://git.openstack.org/cgit/openstack/openstack-ansible/tree/global-requirement-pins.txt)
|
||||||
|
setuptools_version '40.0.0'
|
||||||
|
wheel_version '0.31.1'
|
||||||
|
end
|
||||||
|
|
||||||
if node['openstack']['databag_type'] == 'vault'
|
if node['openstack']['databag_type'] == 'vault'
|
||||||
chef_gem 'chef-vault' do
|
chef_gem 'chef-vault' do
|
||||||
version node['openstack']['vault_gem_version']
|
version node['openstack']['vault_gem_version']
|
||||||
|
|
|
@ -20,13 +20,20 @@
|
||||||
|
|
||||||
# install system packages for Ubuntu/Debian
|
# install system packages for Ubuntu/Debian
|
||||||
case node['platform_family']
|
case node['platform_family']
|
||||||
when 'debian', 'ubuntu'
|
when 'debian'
|
||||||
python_runtime '3.5' do
|
python_runtime '3.5' do
|
||||||
provider :system
|
provider :system
|
||||||
|
# Align with eg. OpenStack-Ansible (https://git.openstack.org/cgit/openstack/openstack-ansible/tree/global-requirement-pins.txt)
|
||||||
|
pip_version '18.0'
|
||||||
|
setuptools_version '40.0.0'
|
||||||
|
wheel_version '0.31.1'
|
||||||
end
|
end
|
||||||
# use Software Collections for CentOS/RHEL
|
# use Software Collections for CentOS/RHEL
|
||||||
when 'rhel'
|
when 'rhel'
|
||||||
python_runtime '3.5' do
|
python_runtime '3.5' do
|
||||||
provider :scl
|
provider :scl
|
||||||
|
pip_version '18.0'
|
||||||
|
setuptools_version '40.0.0'
|
||||||
|
wheel_version '0.31.1'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue