remove default for docker_base_extra_python_requirements and move pla…

…ce in requirements.txt to top
ngaya-ll · Oct 5, 2016 · b0991fa · b0991fa
1 parent fa50bbe
commit b0991fa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -20,8 +20,7 @@ docker_compose_version: "1.8.0"
 # There are times when we will need to be explicit about versions of other libraries
 # See README.md for detals.
 # Empty list means don't specify any additional versions
-docker_base_extra_python_requirements:
-  - "requests==2.7.0"
+docker_base_extra_python_requirements: []
 
 # Version of docker-rotate to use. Versions lower than 3.0 are not supported due
 # to API changes.

diff --git a/templates/requirements.txt.j2 b/templates/requirements.txt.j2
@@ -1,8 +1,8 @@
+{% for item in docker_base_extra_python_requirements %}
+{{ item }}
+{% endfor %}
 docker-py{{ '' if docker_py_version == 'latest' else ('==' + docker_py_version) }}
 dockerrotate=={{ docker_rotate_version }}
 {% if docker_compose_version is not none and docker_compose_version != '' %}
 docker-compose{{ '' if docker_compose_version == 'latest' else ('==' + docker_compose_version) }}
-{% endif %}
-{% for item in docker_base_extra_python_requirements %}
-{{ item }}
-{% endfor %}
+{% endif %}