Merge pull request #10 from edx/feature/jarv/move-vars-to-role

Feature/jarv/move vars to role

README.md

@@ -98,11 +98,15 @@ cloudformation_templates  <-- official edX cloudformation templates
     │   │   └── tasks
     │   ├── lms
     │   │   ├── tasks     <-- tasks that are run to setup an LMS
-    │   │   └── templates
+    │   │   ├── templates
+    │   │   └── vars      <-- main.yml in this directory is auto-loaded when the role is included
+    │   │
     │   └── nginx
-    │       ├── handlers
+    │       ├── handlers 
     │       ├── tasks
-    │       └── templates
+    │       ├── vars
+    │       └── templates 
+    │   (etc)
     └── vars             <-- public variable definitions
         └── secure       <-- secure variables (example)
 

playbooks/edxapp_custom.yml

 - hosts: tag_Group_edxapp_custom
   vars_files:
-    - "vars/lms_vars.yml"
     - "vars/secure/edxapp_stage_vars.yml"
     - "vars/secure/edxapp_custom_vars.yml"
     - "vars/secure/users.yml"

playbooks/edxapp_prod.yml

 - hosts: tag_Group_edxapp_prod
   vars_files:
-    - "vars/lms_vars.yml"
     - "vars/secure/edxapp_prod_vars.yml"
   roles:
     - common

playbooks/edxapp_stage.yml

 - hosts: tag_Group_edxapp_stage
   vars_files:
-    - "vars/lms_vars.yml"
     - "vars/secure/edxapp_stage_vars.yml"
     - "vars/secure/users.yml"
     - "vars/secure/edxapp_stage_users.yml"

playbooks/group_vars/all → playbooks/roles/common/vars/main.yml

-# Variables for all playbooks
-#
-# These variables should apply to all roles and environments. 
-# All definitions can be overrided in the 
-# the group files that are in this directory
-# 
-# If a new variable is added please document it!
+# Variables for the common role
+# Automatically loaded when the common role is used
 ---
 nginx_cfg:
   #   - link - turn on
@@ -20,6 +15,4 @@ nginx_cfg:
   # this value can be overiden in vars/secure/<group>.yml
   htpasswd: |
     edx:$apr1$2gWcIvlc$Nu7b/KTwd5HoIDEkSPNUk/
-pkgs:
-  nginx:
-    state: installed
+

playbooks/roles/lms/vars/main.yml

+# variables common to the lms role, automatically loaded
+# when the role is included
+---
+auth_config:
+  'CONTENTSTORE':
+    'ENGINE':  'xmodule.contentstore.mongo.MongoContentStore'
+  'MODULESTORE':
+    'default':
+      'ENGINE':  'xmodule.modulestore.mongo.MongoModuleStore'
+ 
+env_config:
+  'CACHES':
+    'default':
+      'BACKEND':  'django.core.cache.backends.memcached.MemcachedCache'
+      'KEY_FUNCTION':  'util.memcache.safe_key'
+    'general':
+      'BACKEND':  'django.core.cache.backends.memcached.MemcachedCache'
+      'KEY_FUNCTION':  'util.memcache.safe_key'
+    'mongo_metadata_inheritance':
+      'BACKEND':  'django.core.cache.backends.memcached.MemcachedCache'
+      'KEY_FUNCTION':  'util.memcache.safe_key'
+      'TIMEOUT': 300
+    'staticfiles':
+      'BACKEND':  'django.core.cache.backends.memcached.MemcachedCache'
+      'KEY_FUNCTION':  'util.memcache.safe_key'
+  'CERT_QUEUE':  'certificates'
+  'COURSE_LISTINGS':
+    'default': ['MITx/6.002x/2012_Fall']
+    'stage-berkeley': [ 'BerkeleyX/CS169/fa12']
+    'stage-harvard': [ 'HarvardX/CS50/2012H']
+    'stage-mit': [ 'MITx/3.091/MIT_2012_Fall']
+    'stage-num': [ 'MITx/6.002x-NUM/2012_Fall_NUM']
+    'stage-sjsu': [ 'MITx/6.002x-EE98/2012_Fall_SJSU']
+  'LOCAL_LOGLEVEL':  'INFO'
+  'META_UNIVERSITIES':
+    'UTx': [ 'UTAustinX']
+  'MITX_FEATURES': { 'AUTH_USE_OPENID_PROVIDER': true,
+    'CERTIFICATES_ENABLED': true,  'ENABLE_DISCUSSION_SERVICE': true,
+    'ENABLE_INSTRUCTOR_ANALYTICS': true,  'ENABLE_PEARSON_HACK_TEST': true,
+    'SUBDOMAIN_BRANDING': true,  'SUBDOMAIN_COURSE_LISTINGS': true}
+  'SUBDOMAIN_BRANDING': { 'stage-berkeley':  'BerkeleyX',
+    'stage-harvard':  'HarvardX',  'stage-mit':  'MITx',
+    'stage-num':  'MITx',  'stage-sjsu':  'MITx'}
+  'VIRTUAL_UNIVERSITIES': []
+  'WIKI_ENABLED': true

playbooks/roles/nginx/vars/main.yml

+# Variables for nginx role
+---
+pkgs:
+  nginx:
+    state: installed