External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-03 01:38:50 -03:30
Code Issues Packages Projects Releases Wiki Activity

Fix Openstack inventory on Ubuntu 12 (#2318)

Browse Source 
* Update setuptools and pip when creating venvs
This commit is contained in:
Graham Mainwaring
2016-06-10 09:21:41 -07:00
committed by GitHub
parent 8aa14af228
commit ac8b8dbfb6
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@@ -258,7 +258,9 @@ virtualenv_ansible:
mkdir $(VENV_BASE); \ mkdir $(VENV_BASE); \
fi; \ fi; \
if [ ! -d "$(VENV_BASE)/ansible" ]; then \ if [ ! -d "$(VENV_BASE)/ansible" ]; then \
virtualenv --system-site-packages $(VENV_BASE)/ansible; \ virtualenv --system-site-packages --setuptools $(VENV_BASE)/ansible && \
$(VENV_BASE)/ansible/bin/pip install -I setuptools==23.0.0 && \
$(VENV_BASE)/ansible/bin/pip install -I pip==8.1.1; \
fi; \ fi; \
fi fi
@@ -268,17 +270,17 @@ virtualenv_tower:
mkdir $(VENV_BASE); \ mkdir $(VENV_BASE); \
fi; \ fi; \
if [ ! -d "$(VENV_BASE)/tower" ]; then \ if [ ! -d "$(VENV_BASE)/tower" ]; then \
virtualenv --system-site-packages $(VENV_BASE)/tower; \ virtualenv --system-site-packages --setuptools $(VENV_BASE)/tower && \
$(VENV_BASE)/tower/bin/pip install -I setuptools==23.0.0 && \
$(VENV_BASE)/tower/bin/pip install -I pip==8.1.1; \
fi; \ fi; \
fi fi
requirements_ansible: virtualenv_ansible requirements_ansible: virtualenv_ansible
if [ "$(VENV_BASE)" ]; then \ if [ "$(VENV_BASE)" ]; then \
. $(VENV_BASE)/ansible/bin/activate; \ . $(VENV_BASE)/ansible/bin/activate; \
$(VENV_BASE)/ansible/bin/pip install -U pip==8.1.1; \
$(VENV_BASE)/ansible/bin/pip install -r requirements/requirements_ansible.txt ;\ $(VENV_BASE)/ansible/bin/pip install -r requirements/requirements_ansible.txt ;\
else \ else \
pip install -U pip==8.1.1; \
pip install -r requirements/requirements_ansible.txt ; \ pip install -r requirements/requirements_ansible.txt ; \
fi fi
@@ -286,10 +288,8 @@ requirements_ansible: virtualenv_ansible
requirements_tower: virtualenv_tower requirements_tower: virtualenv_tower
if [ "$(VENV_BASE)" ]; then \ if [ "$(VENV_BASE)" ]; then \
. $(VENV_BASE)/tower/bin/activate; \ . $(VENV_BASE)/tower/bin/activate; \
$(VENV_BASE)/tower/bin/pip install -U pip==8.1.1; \
$(VENV_BASE)/tower/bin/pip install -r requirements/requirements.txt ;\ $(VENV_BASE)/tower/bin/pip install -r requirements/requirements.txt ;\
else \ else \
pip install -U pip==8.1.1; \
pip install -r requirements/requirements.txt ; \ pip install -r requirements/requirements.txt ; \
fi fi