Merge pull request #1901 from edx/feanil/ecomstack_updates

Feanil/ecomstack updates

playbooks/roles/ecommerce/defaults/main.yml

@@ -117,7 +117,9 @@ ecommerce_log_dir: "{{ COMMON_LOG_DIR }}/{{ ecommerce_service_name }}"
 ecommerce_requirements_base: "{{ ecommerce_code_dir }}/requirements"
 ecommerce_requirements:
   - production.txt
-  #- optional.txt
+
+ecommerce_dev_requirements:
+  - local.txt
 
 #
 # OS packages

playbooks/roles/ecommerce/tasks/main.yml

@@ -34,6 +34,16 @@
     state=present
   sudo_user: "{{ ecommerce_user }}"
   with_items: ecommerce_requirements
+  when: not devstack
+
+- name: install application requirements
+  pip: >
+    requirements="{{ ecommerce_requirements_base }}/{{ item }}"
+    virtualenv="{{ ecommerce_home }}/venvs/{{ ecommerce_service_name }}"
+    state=present
+  sudo_user: "{{ ecommerce_user }}"
+  with_items: ecommerce_dev_requirements
+  when: devstack
 
 - name: migrate
   shell: >

playbooks/roles/edx_service/tasks/main.yml

@@ -56,6 +56,11 @@
     generate_ssh_key=yes
 
 # Assumes that the home directory has been created above.
+# In some cases(vagrant boxes) the home directory gets created
+# but does not have the corrent owner and group. In vagrant for
+# example we were seeing it defaulting it to `root` for both.
+# The item that is a blank string("") ensures the ownership
+# of the home directory is always correct before proceeding.
 - name: create edx_service app, venv, data, and staticfiles dirs
   file: >
     path="{{ edx_service_home }}/{{ item }}"
@@ -63,6 +68,7 @@
     owner="{{ edx_service_name }}"
     group="{{ common_web_group }}"
   with_items:
+    - ""
     - "venvs"
     - "data"
     - "staticfiles"

playbooks/vagrant-ecomstack.yml

@@ -17,6 +17,7 @@
     - edxlocal
     - mongo
     - edxapp
+    - ecommerce
     - browsers
     - browsermob-proxy
     - local_dev

vagrant/base/ecomstack/Vagrantfile

@@ -10,14 +10,16 @@ MEMORY = 4096
 CPU_COUNT = 2
 
 edx_platform_mount_dir = "edx-platform"
-edx_ecommerce_mount_dir = "edx-ecommerce"
+ecommerce_mount_dir = "ecommerce"
 oscar_extensions_mount_dir = "django-oscar-extensions"
+django_oscar_mount_dir = "django-oscar"
 
 if ENV['VAGRANT_MOUNT_BASE']
 
   edx_platform_mount_dir = ENV['VAGRANT_MOUNT_BASE'] + "/" + edx_platform_mount_dir
-  edx_ecommerce_mount_dir = ENV['VAGRANT_MOUNT_BASE'] + "/" + edx_ecommerce_mount_dir
+  ecommerce_mount_dir = ENV['VAGRANT_MOUNT_BASE'] + "/" + ecommerce_mount_dir
   oscar_extensions_mount_dir = ENV['VAGRANT_MOUNT_BASE'] + "/" + oscar_extensions_mount_dir
+  django_oscar_mount_dir = ENV['VAGRANT_MOUNT_BASE'] + "/" + django_oscar_mount_dir
 
 end
 
@@ -43,16 +45,20 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   if ENV['VAGRANT_USE_VBOXFS'] == 'true'
     config.vm.synced_folder "#{edx_platform_mount_dir}", "/edx/app/edxapp/edx-platform",
       create: true, owner: "edxapp", group: "www-data"
-    config.vm.synced_folder "#{edx_ecommerce_mount_dir}", "/edx/app/ecom/edx-ecommerce",
-      create: true, owner: "edxapp", group: "www-data"
-    config.vm.synced_folder "#{oscar_extensions_mount_dir}", "/edx/app/ecom/django-oscar-extensions",
-      create: true, owner: "edxapp", group: "www-data"
+    config.vm.synced_folder "#{ecommerce_mount_dir}", "/edx/app/ecommerce/ecommerce",
+      create: true, owner: "ecommerce", group: "www-data"
+    config.vm.synced_folder "#{oscar_extensions_mount_dir}", "/edx/app/ecommerce/depends/django-oscar-extensions",
+      create: true, owner: "ecommerce", group: "www-data"
+    config.vm.synced_folder "#{django_oscar_mount_dir}", "/edx/app/ecommerce/depends/django-oscar",
+      create: true, owner: "ecommerce", group: "www-data"
   else
     config.vm.synced_folder "#{edx_platform_mount_dir}", "/edx/app/edxapp/edx-platform",
       create: true, nfs: true
-    config.vm.synced_folder "#{edx_ecommerce_mount_dir}", "/edx/app/ecom/edx-ecommerce",
+    config.vm.synced_folder "#{ecommerce_mount_dir}", "/edx/app/ecommerce/ecommerce",
+      create: true, nfs: true
+    config.vm.synced_folder "#{oscar_extensions_mount_dir}", "/edx/app/ecommerce/depends/django-oscar-extensions",
       create: true, nfs: true
-    config.vm.synced_folder "#{oscar_extensions_mount_dir}", "/edx/app/ecom/django-oscar-extensions",
+    config.vm.synced_folder "#{django_oscar_mount_dir}", "/edx/app/ecommerce/depends/django-oscar",
       create: true, nfs: true
   end