Merge pull request #3902 from edx/bok_choy_support

PLAT-1228 Support bok-choy in edxapp Docker devstack

docker/build/edxapp/ansible_overrides.yml

@@ -26,3 +26,12 @@ EDXAPP_INSTALL_PRIVATE_REQUIREMENTS: true
 EDXAPP_SEARCH_HOST: 'edx.devstack.elasticsearch'
 
 EDXAPP_PYTHON_SANDBOX: false
+
+edxapp_debian_pkgs_extra:
+  - mongodb-clients
+  - mysql-client
+
+edxapp_environment_extra:
+  SELENIUM_BROWSER: 'firefox'
+  SELENIUM_HOST: 'edx.devstack.firefox'
+  SELENIUM_PORT: '4444'

playbooks/roles/edxapp/defaults/main.yml

@@ -747,7 +747,7 @@ edxapp_helper_scripts:
     - edxapp-update-assets
     - edxapp-shell
 
-edxapp_environment:
+edxapp_environment_default:
   LANG: "{{ EDXAPP_LANG }}"
   NO_PREREQ_INSTALL: "{{ EDXAPP_NO_PREREQ_INSTALL }}"
   SKIP_WS_MIGRATIONS: 1
@@ -761,6 +761,10 @@ edxapp_environment:
   # yaml based configs is complete
   CONFIG_ROOT: "{{ edxapp_app_dir }}"
 
+edxapp_environment_extra: {}
+
+edxapp_environment: "{{ edxapp_environment_default | combine(edxapp_environment_extra) }}"
+
 edxapp_generic_doc_store_config: &edxapp_generic_default_docstore
   db: "{{ EDXAPP_MONGO_DB_NAME }}"
   host: "{{ EDXAPP_MONGO_HOSTS }}"
@@ -1253,7 +1257,7 @@ edxapp_requirements_with_github_urls:
 
 edxapp_chrislea_ppa: "ppa:chris-lea/node.js"
 
-edxapp_debian_pkgs:
+edxapp_debian_pkgs_default:
   # for compiling the virtualenv
   # (only needed if wheel files aren't available)
   - s3cmd
@@ -1276,6 +1280,8 @@ edxapp_debian_pkgs:
   - python-dev
   - libsqlite3-dev
 
+edxapp_debian_pkgs_extra: []
+
 # Deploy Specific Vars
 edxapp_lms_variant: lms
 edxapp_cms_variant: cms

playbooks/roles/edxapp/tasks/main.yml

@@ -124,7 +124,9 @@
     name: "{{ item }}"
     state: present
     update_cache: yes
-  with_items: "{{ edxapp_debian_pkgs }}"
+  with_flattened:
+    - "{{ edxapp_debian_pkgs_default }}"
+    - "{{ edxapp_debian_pkgs_extra }}"
   tags:
     - install
     - install:base