Merge pull request #771 from edx/feanil/demo_common_dep

Feanil/demo common dep

playbooks/roles/demo/defaults/main.yml

@@ -26,3 +26,8 @@ demo_test_users:
   - email: 'verified@example.com'
     mode: verified
     password: edx
+
+demo_edxapp_user: 'edxapp'
+demo_edxapp_venv_bin: '{{COMMON_APP_DIR}}/{{demo_edxapp_user}}/venvs/{{demo_edxapp_user}}/bin'
+demo_edxapp_course_data_dir: '{{COMMON_DATA_DIR}}/{{demo_edxapp_user}}/data'
+demo_edxapp_code_dir: '{{COMMON_APP_DIR}}/{{demo_edxapp_user}}/edx-platform'

playbooks/roles/demo/tasks/deploy.yml

@@ -2,41 +2,41 @@
 
 - name: check out the demo course
   git: dest={{ demo_code_dir }}  repo={{ demo_repo }} version={{ demo_version }}
-  sudo_user: "{{ edxapp_user }}"
+  sudo_user: "{{ demo_edxapp_user }}"
   register: demo_checkout
 
 - name: import demo course
   shell: >
-    {{ edxapp_venv_bin }}/python ./manage.py cms --settings=aws import {{ edxapp_course_data_dir }} {{ demo_code_dir }}
-    chdir={{ edxapp_code_dir }}
+    {{ demo_edxapp_venv_bin }}/python ./manage.py cms --settings=aws import {{ demo_edxapp_course_data_dir }} {{ demo_code_dir }}
+    chdir={{ demo_edxapp_code_dir }}
   sudo_user: "{{ common_web_user }}"
   when: demo_checkout.changed
 
 - name: create some test users and enroll them in the course
   shell: >
-    {{ edxapp_venv_bin }}/python ./manage.py lms --settings=aws --service-variant lms create_user -e {{ item.email }} -p {{ item.password }} -m {{ item.mode }} -c {{ demo_course_id }}
-    chdir={{ edxapp_code_dir }}
+    {{ demo_edxapp_venv_bin }}/python ./manage.py lms --settings=aws --service-variant lms create_user -e {{ item.email }} -p {{ item.password }} -m {{ item.mode }} -c {{ demo_course_id }}
+    chdir={{ demo_edxapp_code_dir }}
   sudo_user: "{{ common_web_user }}"
   with_items: demo_test_users
   when: demo_checkout.changed
 
 - name: create staff user
   shell: >
-    {{ edxapp_venv_bin }}/python ./manage.py lms --settings=aws --service-variant lms create_user -e staff@example.com -p edx -s -c {{ demo_course_id }}
-    chdir={{ edxapp_code_dir }}
+    {{ demo_edxapp_venv_bin }}/python ./manage.py lms --settings=aws --service-variant lms create_user -e staff@example.com -p edx -s -c {{ demo_course_id }}
+    chdir={{ demo_edxapp_code_dir }}
   sudo_user: "{{ common_web_user }}"
   when: demo_checkout.changed
 
 - name: add test users to the certificate whitelist
   shell: >
-    {{ edxapp_venv_bin }}/python ./manage.py lms --settings=aws --service-variant lms cert_whitelist -a {{ item.email }} -c {{ demo_course_id }}
-    chdir={{ edxapp_code_dir }}
+    {{ demo_edxapp_venv_bin }}/python ./manage.py lms --settings=aws --service-variant lms cert_whitelist -a {{ item.email }} -c {{ demo_course_id }}
+    chdir={{ demo_edxapp_code_dir }}
   with_items: demo_test_users
   when: demo_checkout.changed
 
 - name: seed the forums for the demo course
   shell: >
-    {{ edxapp_venv_bin }}/python ./manage.py lms --settings=aws seed_permissions_roles {{ demo_course_id }}
-    chdir={{ edxapp_code_dir }}
+    {{ demo_edxapp_venv_bin }}/python ./manage.py lms --settings=aws seed_permissions_roles {{ demo_course_id }}
+    chdir={{ demo_edxapp_code_dir }}
   with_items: demo_test_users
   when: demo_checkout.changed

playbooks/roles/demo/tasks/main.yml

@@ -33,6 +33,6 @@
 - name: create demo app and data dirs
   file: >
     path="{{ demo_app_dir }}" state=directory
-    owner="{{ edxapp_user }}" group="{{ common_web_group }}"
+    owner="{{ demo_edxapp_user }}" group="{{ common_web_group }}"
 
 - include: deploy.yml tags=deploy