openstack/openstack-ansible
Code Issues Proposed changes

Merge "pin setuptools to 7.0 to workaround brokenness in 8.x"

Browse Source
This commit is contained in:
Jenkins 2014-12-16 14:59:59 +00:00 committed by Gerrit Code Review
commit cc7cd162db
4 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
requirements.txt
View File

@ -14,4 +14,5 @@ requests==2.4.1
cloudlib==0.0.8 cloudlib==0.0.8
pip==1.5.6 pip==1.5.6
wheel==0.24.0 wheel==0.24.0
setuptools==7.0
http://mirror.rackspace.com/rackspaceprivatecloud/downloads/ansible-1.6.10.tar.gz http://mirror.rackspace.com/rackspaceprivatecloud/downloads/ansible-1.6.10.tar.gz

6
rpc_deployment/vars/repo_packages/all_common.yml
View File

@ -39,12 +39,6 @@ apt_common_repos:
get_pip_url: "{{ rpc_repo_url }}/downloads/get-pip.py" get_pip_url: "{{ rpc_repo_url }}/downloads/get-pip.py"
get_pip_sha256sum: "d43dc33a5670d69dd14a9be1f2b2fa27ebf124ec1b212a47425331040f742a9b" get_pip_sha256sum: "d43dc33a5670d69dd14a9be1f2b2fa27ebf124ec1b212a47425331040f742a9b"
pip_common_packages:
- wheel
- setuptools
- pip
## Base Packages ## Base Packages
apt_common_packages: apt_common_packages:
- aptitude - aptitude

1
rpc_deployment/vars/repo_packages/readme.rst
View File

@ -34,6 +34,5 @@ Defaults processed by the **package_source_archive**,
* pip_wheel_name: ``string`` pip package name to FIRST attempt installation of. * pip_wheel_name: ``string`` pip package name to FIRST attempt installation of.
* service_pip_dependencies: ``list`` of ``strings``. * service_pip_dependencies: ``list`` of ``strings``.
* container_packages: ``list`` of ``strings``. * container_packages: ``list`` of ``strings``.
* pip_common_packages: ``list`` of ``strings``.
* apt_common_packages: ``list`` of ``strings``. * apt_common_packages: ``list`` of ``strings``.
* common_util_packages: ``list`` of ``strings``. * common_util_packages: ``list`` of ``strings``.

2
rpc_deployment/vars/repo_packages/swift.yml
View File

@ -37,11 +37,9 @@ service_pip_dependencies:
container_packages: container_packages:
- curl - curl
- python-pip
- rsync - rsync
- openssh-server - openssh-server
- git-core - git-core
- python-setuptools
- python-dev - python-dev
- gcc - gcc
- libffi-dev - libffi-dev