diff --git a/Makefile b/Makefile index 6a46e6e22f..7a6a85ad38 100644 --- a/Makefile +++ b/Makefile @@ -284,7 +284,11 @@ virtualenv_tower: fi requirements_ansible: virtualenv_ansible - $(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) --ignore-installed --no-binary $(SRC_ONLY_PKGS) -r requirements/requirements_ansible.txt + if [[ "$(PIP_OPTIONS)" == *"--no-index"* ]]; then \ + cat requirements/requirements_ansible.txt requirements/requirements_ansible_local.txt | $(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) --ignore-installed -r /dev/stdin ; \ + else \ + cat requirements/requirements_ansible.txt requirements/requirements_ansible_git.txt | $(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) --ignore-installed -r /dev/stdin ; \ + fi $(VENV_BASE)/ansible/bin/pip uninstall --yes -r requirements/requirements_ansible_uninstall.txt requirements_ansible_dev: @@ -294,7 +298,11 @@ requirements_ansible_dev: # Install third-party requirements needed for Tower's environment. requirements_tower: virtualenv_tower - $(VENV_BASE)/tower/bin/pip install $(PIP_OPTIONS) --ignore-installed --no-binary $(SRC_ONLY_PKGS) -r requirements/requirements.txt + if [[ "$(PIP_OPTIONS)" == *"--no-index"* ]]; then \ + cat requirements/requirements.txt requirements/requirements_local.txt | $(VENV_BASE)/tower/bin/pip install $(PIP_OPTIONS) --ignore-installed -r /dev/stdin ; \ + else \ + cat requirements/requirements.txt requirements/requirements_git.txt | $(VENV_BASE)/tower/bin/pip install $(PIP_OPTIONS) --ignore-installed -r /dev/stdin ; \ + fi $(VENV_BASE)/tower/bin/pip uninstall --yes -r requirements/requirements_tower_uninstall.txt requirements_tower_dev: diff --git a/requirements/requirements.in b/requirements/requirements.in index 19d222e315..2ba5b1fa9a 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -1,8 +1,3 @@ --e git+https://github.com/ansible/ansiconv.git@tower_1.0.0#egg=ansiconv --e git+https://github.com/ansible/django-jsonbfield@fix-sqlite_serialization#egg=jsonbfield --e git+https://github.com/ansible/django-qsstats-magic.git@tower_0.7.2#egg=django-qsstats-magic --e git+https://github.com/ansible/dm.xmlsec.binding.git@master#egg=dm.xmlsec.binding --e git+https://github.com/chrismeyersfsu/pyrax@tower#egg=pyrax apache-libcloud==1.3.0 appdirs==1.4.2 asgi-amqp==0.4.1 diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 1ff0a862cb..57b04b3e98 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -4,11 +4,6 @@ # # pip-compile --output-file requirements/requirements.txt requirements/requirements.in # -git+https://github.com/ansible/ansiconv.git@tower_1.0.0#egg=ansiconv -git+https://github.com/ansible/django-qsstats-magic.git@tower_0.7.2#egg=django-qsstats-magic -git+https://github.com/ansible/dm.xmlsec.binding.git@master#egg=dm.xmlsec.binding -git+https://github.com/ansible/django-jsonbfield@fix-sqlite_serialization#egg=jsonbfield -git+https://github.com/chrismeyersfsu/pyrax@tower#egg=pyrax adal==0.4.3 # via msrestazure amqp==1.4.9 # via kombu anyjson==0.3.3 # via kombu diff --git a/requirements/requirements_ansible.in b/requirements/requirements_ansible.in index c5479b85d9..13c7823172 100644 --- a/requirements/requirements_ansible.in +++ b/requirements/requirements_ansible.in @@ -1,4 +1,3 @@ --e git+https://github.com/chrismeyersfsu/pyrax@tower#egg=pyrax apache-libcloud==1.3.0 azure==2.0.0rc6 backports.ssl-match-hostname==3.5.0.1 diff --git a/requirements/requirements_ansible.txt b/requirements/requirements_ansible.txt index 763dc872cb..ef2138c312 100644 --- a/requirements/requirements_ansible.txt +++ b/requirements/requirements_ansible.txt @@ -4,7 +4,6 @@ # # pip-compile --output-file requirements/requirements_ansible.txt requirements/requirements_ansible.in # -git+https://github.com/chrismeyersfsu/pyrax@tower#egg=pyrax adal==0.4.3 # via msrestazure amqp==1.4.9 # via kombu anyjson==0.3.3 # via kombu diff --git a/requirements/requirements_ansible_git.txt b/requirements/requirements_ansible_git.txt new file mode 100644 index 0000000000..d71c0f11ad --- /dev/null +++ b/requirements/requirements_ansible_git.txt @@ -0,0 +1 @@ +git+https://github.com/chrismeyersfsu/pyrax@tower#egg=pyrax diff --git a/requirements/requirements_git.txt b/requirements/requirements_git.txt new file mode 100644 index 0000000000..8439a821cb --- /dev/null +++ b/requirements/requirements_git.txt @@ -0,0 +1,5 @@ +git+https://github.com/ansible/ansiconv.git@tower_1.0.0#egg=ansiconv +git+https://github.com/ansible/django-qsstats-magic.git@tower_0.7.2#egg=django-qsstats-magic +git+https://github.com/ansible/dm.xmlsec.binding.git@master#egg=dm.xmlsec.binding +git+https://github.com/ansible/django-jsonbfield@fix-sqlite_serialization#egg=jsonbfield +git+https://github.com/chrismeyersfsu/pyrax@tower#egg=pyrax diff --git a/tools/docker-compose/Dockerfile b/tools/docker-compose/Dockerfile index 4a78226a3a..ef0854bcc7 100644 --- a/tools/docker-compose/Dockerfile +++ b/tools/docker-compose/Dockerfile @@ -3,7 +3,9 @@ FROM centos:7 ADD Makefile /tmp/Makefile RUN mkdir /tmp/requirements ADD requirements/requirements.txt \ +requirements/requirements_git.txt \ requirements/requirements_ansible.txt \ +requirements/requirements_ansible_git.txt \ requirements/requirements_dev.txt \ requirements/requirements_ansible_uninstall.txt \ requirements/requirements_tower_uninstall.txt \