add toggle variables to lms/cms/preview/xml

playbooks/roles/edxapp/tasks/main.yml

@@ -118,11 +118,11 @@
   - install
 
 - include: lms.yml
-  when: lms_env_config != False
+  when: "'lms' in service_variants_enabled"
 - include: lms-xml.yml
-  when: lms_xml_env_config != False
+  when: "'lms-xml' in service_variants_enabled"
 - include: cms.yml
-  when: cms_env_config != False
+  when: "'cms' in service_variants_enabled"
 - include: lms-preview.yml
-  when: lms_preview_env_config != False
+  when: "'lms-preview' in service_variants_enabled"
  

playbooks/roles/edxapp/vars/main.yml

@@ -9,14 +9,20 @@
 # It will also enable the corresponding section in the 
 # 'edxapp' upstart job.
 
-lms_auth_config: false
-lms_env_config: false
-lms_preview_auth_config: false
-lms_preview_env_config: false
-cms_auth_config: false
-cms_env_config: false
-lms_xml_auth_config: false
-lms_xml_env_config: false
+service_variants_enabled: 
+  - lms
+  - lms-xml
+  - cms
+  - lms-preview
+
+lms_auth_config: {}
+lms_env_config: {}
+lms_preview_auth_config: {}
+lms_preview_env_config: {}
+cms_auth_config: {}
+cms_env_config: {}
+lms_xml_auth_config: {}
+lms_xml_env_config: {}
 
 lms_source_repo: git@github.com:edx/edx-platform.git
 lms_version: 'HEAD'

playbooks/roles/gunicorn/templates/edxapp.conf.j2

@@ -11,25 +11,25 @@ stop on runlevel [!2345]
 ##
 pre-start script
 
-{% if lms_xml_env_config %}
+{% if 'lms-xml' in service_variants_enabled %}
 if [ -e /etc/init/lms-xml.conf ]; then
   start wait-for-state WAIT_FOR=lms-xml WAITER=$UPSTART_JOB
 fi
 {% endif %}
 
-{% if lms_env_config %}
+{% if 'lms' in service_variants_enabled %}
 if [ -e /etc/init/lms.conf ]; then
   start wait-for-state WAIT_FOR=lms WAITER=$UPSTART_JOB
 fi
 {% endif %}
 
-{% if lms_preview_env_config %}
+{% if 'lms-preview' in service_variants_enabled %}
 if [ -e /etc/init/lms-preview.conf ]; then
   start wait-for-state WAIT_FOR=lms-preview WAITER=$UPSTART_JOB
 fi
 {% endif %}
 
-{% if cms_env_config %}
+{% if 'cms' in service_variants_enabled %}
 if [ -e /etc/init/cms.conf ]; then
   start wait-for-state WAIT_FOR=cms WAITER=$UPSTART_JOB
 fi
@@ -51,25 +51,25 @@ end script
 
 pre-stop script
 
-{% if lms_xml_env_config %}
+{% if 'lms-xml' in service_variants_enabled %}
 if [ -e /etc/init/lms-xml.conf ]; then
   start wait-for-state WAIT_FOR=lms-xml WAITER=$UPSTART_JOB TARGET_GOAL="stop"
 fi
 {% endif %}
 
-{% if lms_env_config %}
+{% if 'lms' in service_variants_enabled %}
 if [ -e /etc/init/lms.conf ]; then
   start wait-for-state WAIT_FOR=lms WAITER=$UPSTART_JOB TARGET_GOAL="stop"
 fi
 {% endif %}
 
-{% if lms_preview_env_config %}
+{% if 'lms-preview' in service_variants_enabled %}
 if [ -e /etc/init/lms-preview.conf ]; then
   start wait-for-state WAIT_FOR=lms-preview WAITER=$UPSTART_JOB TARGET_GOAL="stop"
 fi
 {% endif %}
 
-{% if cms_env_config %}
+{% if 'cms' in service_variants_enabled %}
 if [ -e /etc/init/cms.conf ]; then
   start wait-for-state WAIT_FOR=cms WAITER=$UPSTART_JOB TARGET_GOAL="stop"
 fi