Merge pull request #3891 from edx/andya/support-development-requirements

Support development requirements in Vagrant and Docker devstacks

.dockerignore

 *
 !playbooks/
-!docker/build/*/ansible_overrides.yml
 !docker/build/*
+!docker/build/*/*.yml
 docker/build/*/Dockerfile
 !docker/plays/
 !util/install/

CHANGELOG.md

 - Role: edxapp
+  - Install development.txt in Vagrant and Docker devstacks
+
+- Role: edxapp
   - Set the EDXAPP_IMPORT_EXPORT_BUCKET setting to an empty string
 
 - Role: edxapp

docker/build/edxapp/Dockerfile

@@ -18,6 +18,7 @@ ADD . /edx/app/edx_ansible/edx_ansible
 WORKDIR /edx/app/edx_ansible/edx_ansible/docker/plays
 
 COPY docker/build/edxapp/ansible_overrides.yml /
+COPY docker/build/edxapp/devstack.yml /
 
 ARG OPENEDX_RELEASE=master
 ENV OPENEDX_RELEASE=${OPENEDX_RELEASE}
@@ -25,6 +26,7 @@ RUN sudo /edx/app/edx_ansible/venvs/edx_ansible/bin/ansible-playbook edxapp.yml
     -c local -i '127.0.0.1,' \
     -t 'install,assets,devstack' \
     --extra-vars=edx_platform_version=${OPENEDX_RELEASE} \
-    --extra-vars="@/ansible_overrides.yml"
+    --extra-vars="@/ansible_overrides.yml" \
+    --extra-vars="@/devstack.yml"
 
 EXPOSE 18000 18010

docker/build/edxapp/devstack.yml

+../../../playbooks/roles/edxapp/vars/devstack.yml
\ No newline at end of file

playbooks/roles/edxapp/vars/devstack.yml

 ---
-# Currently the only difference between these requierements and the role
-# defaults is the presence of the "testing.txt" file, which is used to install
-# packages not used in production
-pre_requirements_file:    "{{ edxapp_code_dir }}/requirements/edx/pre.txt"
-github_requirements_file: "{{ edxapp_code_dir }}/requirements/edx/github.txt"
-custom_requirements_file:   "{{ edxapp_code_dir }}/requirements/edx/custom.txt"
-local_requirements_file:  "{{ edxapp_code_dir }}/requirements/edx/local.txt"
-base_requirements_file:   "{{ edxapp_code_dir }}/requirements/edx/base.txt"
-post_requirements_file:   "{{ edxapp_code_dir }}/requirements/edx/post.txt"
-paver_requirements_file:   "{{ edxapp_code_dir }}/requirements/edx/paver.txt"
+# The only difference between these requirements and the role defaults is the
+# presence of the "development.txt" and "testing.txt" files. These two sets
+# of requirements should not be used in production.
+development_requirements_file:   "{{ edxapp_code_dir }}/requirements/edx/development.txt"
 testing_requirements_file:   "{{ edxapp_code_dir }}/requirements/edx/testing.txt"
 
 edxapp_requirements_files:
@@ -19,4 +13,5 @@ edxapp_requirements_files:
   - "{{ base_requirements_file }}"
   - "{{ post_requirements_file }}"
   - "{{ paver_requirements_file }}"
+  - "{{ development_requirements_file }}"
   - "{{ testing_requirements_file }}"