setup separate role for whitelabel

playbooks/edx-east/whitelabel.yml

+- name: Setup Whitelabel themes
+  hosts: all
+  become: True
+  gather_facts: True
+  vars_files:
+    - "roles/edxapp/defaults/main.yml"
+  roles:
+    - whitelabel

playbooks/roles/edxapp/tasks/service_variant_config.yml

@@ -162,15 +162,3 @@
   tags:
     - gather_static_assets
     - assets
-
-- name: Create Sites and Themes
-  shell: >
-    {{ COMMON_BIN_DIR }}/python.edxapp {{ COMMON_BIN_DIR }}/manage.edxapp lms --settings={{ COMMON_EDXAPP_SETTINGS }}
-    create_sites_and_configurations --dns-name {{ dns_name }}
-  become_user: "{{ edxapp_user }}"
-  environment: "{{ edxapp_environment }}"
-
-- name: "display compile assets command"
-  debug:
-    msg: "{{ COMMON_BIN_DIR }}/edxapp-update-assets-{{ item }}"
-  with_items: "{{ service_variants_enabled }}"

playbooks/roles/launch_ec2/tasks/main.yml

@@ -73,24 +73,6 @@
   delay: 30
   with_items: "{{ ec2.instances }}"
 
-- name: Add DNS name for themes
-  local_action:
-    module: route53
-    overwrite: yes
-    command: create
-    zone: "{{ dns_zone }}"
-    type: CNAME
-    ttl: 300
-    record: "{{ item[1] }}-{{ dns_name }}.{{ dns_zone }}"
-    value: "{{ item[0].public_dns_name }}"
-  register: task_result
-  until: task_result|succeeded
-  retries: 5
-  delay: 30
-  with_nested:
-    - "{{ ec2.instances }}"
-    - ['mitxpro', 'hms', 'harvardx', 'wharton', 'juilliard', 'campus']
-
 - name: Add DNS names for services
   local_action:
     module: route53
@@ -109,27 +91,6 @@
     - "{{ ec2.instances }}"
     - ['studio', 'ecommerce', 'preview', 'discovery', 'credentials', 'veda']
 
-
-- name: Add DNS names for themes services
-  local_action:
-    module: route53
-    overwrite: yes
-    command: create
-    zone: "{{ dns_zone }}"
-    type: CNAME
-    ttl: 300
-    record: "{{ item[1] }}-{{ item[2] }}-{{ dns_name }}.{{ dns_zone }}"
-    value: "{{ item[0].public_dns_name }}"
-  register: task_result
-  until: task_result|succeeded
-  retries: 5
-  delay: 30
-  with_nested:
-    - "{{ ec2.instances }}"
-    - ['studio', 'ecommerce', 'preview', 'discovery', 'credentials']
-    - ['mitxpro', 'hms', 'harvardx', 'wharton', 'juilliard']
-
-
 - name: Display cnames
   debug:
     msg: "{{ item[1] }}-{{ dns_name }}.{{ dns_zone }} {{ item[0].public_dns_name }}"

playbooks/roles/whitelabel/meta/main.yml

+---
+dependencies:
+  - edxapp

playbooks/roles/whitelabel/tasks/main.yml

+
+- name: Add DNS name for themes
+  local_action:
+    module: route53
+    overwrite: yes
+    command: create
+    zone: "{{ dns_zone }}"
+    type: CNAME
+    ttl: 300
+    record: "{{ item[1] }}-{{ dns_name }}.{{ dns_zone }}"
+    value: "{{ item[0].public_dns_name }}"
+  register: task_result
+  until: task_result|succeeded
+  retries: 5
+  delay: 30
+  with_nested:
+    - "{{ ec2.instances }}"
+    - ['mitxpro', 'hms', 'harvardx', 'wharton', 'juilliard', 'campus']
+
+- name: Add DNS names for themes services
+  local_action:
+    module: route53
+    overwrite: yes
+    command: create
+    zone: "{{ dns_zone }}"
+    type: CNAME
+    ttl: 300
+    record: "{{ item[1] }}-{{ item[2] }}-{{ dns_name }}.{{ dns_zone }}"
+    value: "{{ item[0].public_dns_name }}"
+  register: task_result
+  until: task_result|succeeded
+  retries: 5
+  delay: 30
+  with_nested:
+    - "{{ ec2.instances }}"
+    - ['studio', 'ecommerce', 'preview', 'discovery', 'credentials']
+    - ['mitxpro', 'hms', 'harvardx', 'wharton', 'juilliard']
+
+- name: Create Sites and Themes
+  shell: >
+    {{ COMMON_BIN_DIR }}/python.edxapp {{ COMMON_BIN_DIR }}/manage.edxapp lms --settings={{ COMMON_EDXAPP_SETTINGS }}
+    create_sites_and_configurations --dns-name {{ dns_name }}
+  become_user: "{{ edxapp_user }}"
+  environment: "{{ edxapp_environment }}"
+
+- name: "display compile assets command"
+  debug:
+    msg: "{{ COMMON_BIN_DIR }}/edxapp-update-assets-{{ item }}"
+  with_items: "{{ service_variants_enabled }}"

util/jenkins/ansible-provision.sh

@@ -404,5 +404,7 @@ fi
 # set the hostname
 run_ansible set_hostname.yml -i "${deploy_host}," -e hostname_fqdn=${deploy_host} --user ubuntu
 
+run_ansible whitelabel.yml -i "${deploy_host}," $extra_var_arg --user ubuntu
+
 rm -f "$extra_vars_file"
 rm -f ${extra_vars_file}_clean