Testing

playbooks/roles/ecommerce/defaults/main.yml

@@ -107,7 +107,7 @@ ECOMMERCE_THEME_SCSS: 'sass/themes/default.scss'
 ECOMMERCE_THEMES_DIR_NAME: 'ecommerce'
 
 ECOMMERCE_COMPREHENSIVE_THEME_DIR: !!null
-ECOMMERCE_ENABLE_COMPREHENSIVE_THEMING: false
+ECOMMERCE_ENABLE_COMPREHENSIVE_THEMING: true
 ECOMMERCE_DEFAULT_SITE_THEME: !!null
 
 # Celery

playbooks/roles/ecommerce/meta/main.yml

@@ -23,7 +23,5 @@ dependencies:
       debian: "{{ ecommerce_debian_pkgs }}"
       redhat: "{{ ecommerce_redhat_pkgs }}"
   - role: edx-themes
-    sync_src_themes_dir_name: "{{ ECOMMERCE_THEMES_DIR_NAME }}"
-    sync_dest_themes_dir: "{{ ECOMMERCE_COMPREHENSIVE_THEME_DIR }}"
     when: "{{ ECOMMERCE_ENABLE_COMPREHENSIVE_THEMING }}"
   - oraclejdk

playbooks/roles/ecommerce/tasks/main.yml

@@ -21,6 +21,16 @@
 #
 #
 
+# Copy themes directories.
+# while synchronizing we need to make sure that directory path ends with a trailing slash,
+# otherwise synchronize will copy the src dir instead of the files/dirs included in the src directory
+- name: synchronize theme directories
+  synchronize: >
+    src={{ THEMES_CODE_DIR }}/{{ ECOMMERCE_THEMES_DIR_NAME }}/
+    dest= {{ ECOMMERCE_COMPREHENSIVE_THEME_DIR }}/
+  sudo_user: "{{ ecommerce_user }}"
+  when: ECOMMERCE_ENABLE_COMPREHENSIVE_THEMING and THEMES_CODE_DIR is defined
+
 - name: "add gunicorn configuration file"
   template: >
     src=edx/app/ecommerce/ecommerce_gunicorn.py.j2

playbooks/roles/edx-themes/defaults/main.yml

@@ -20,7 +20,7 @@ THEMES_GIT_IDENTITY: !!null
 THEMES_GIT_PROTOCOL: "{{ COMMON_GIT_PROTOCOL }}"
 THEMES_GIT_MIRROR: "{{ COMMON_GIT_MIRROR }}"
 THEMES_GIT_PATH: "{{ COMMON_GIT_PATH }}"
-THEMES_REPO: "sample-themes.git"
+THEMES_REPO: "ecommerce.git"
 THEMES_VERSION: "master"
 
 

playbooks/roles/edx-themes/tasks/main.yml

@@ -25,8 +25,6 @@
 #
 # dependencies:
 #   - role: themes
-#     sync_src_themes_dir_name: "edx-platform"
-#     sync_dest_themes_dir: "/edx/app/edxapp/edx-platform/themes"
 #     when do_setup_themes
 #
 
@@ -113,12 +111,3 @@
   tags:
     - install
     - install:code
-
-# while synchronizing we need to make sure that directory path ends with a trailing slash,
-# otherwise synchronize will copy the src dir instead of the files/dirs included in the src directory
-- name: synchronize theme directories
-  synchronize: >
-    src={{ THEMES_CODE_DIR }}/{{ sync_src_themes_dir_name }}/
-    dest= {{ sync_dest_themes_dir }}/
-  when: sync_src_themes_dir_name is defined and sync_dest_themes_dir is defined
-