Add the dev common vars to the list of vars files.

playbooks/edx-east/edx_dev2.yml

@@ -3,6 +3,7 @@
   sudo: True
   vars_files:
     - "{{ secure_dir }}/vars/dev/dev2.yml"
+    - "{{ secure_dir }}/vars/dev/common.yml"
     - "{{ secure_dir }}/vars/common/common.yml"
     - "{{ secure_dir }}/vars/users.yml"
   roles:
@@ -18,6 +19,7 @@
   sudo: True
   vars_files:
     - "{{ secure_dir }}/vars/dev/dev2.yml"
+    - "{{ secure_dir }}/vars/dev/common.yml"
     - "{{ secure_dir }}/vars/common/common.yml"
     - "{{ secure_dir }}/vars/users.yml"
   roles:
@@ -32,6 +34,7 @@
 #  sudo: True
 #  vars_files:
 #    - "{{ secure_dir }}/vars/dev/dev2.yml"
+#    - "{{ secure_dir }}/vars/dev/common.yml"
 #    - "{{ secure_dir }}/vars/users.yml"
 #  roles:
 #    - common
@@ -42,6 +45,7 @@
 #  sudo: True
 #  vars_files:
 #    - "{{ secure_dir }}/vars/dev/dev2.yml"
+#    - "{{ secure_dir }}/vars/dev/common.yml"
 #    - "{{ secure_dir }}/vars/users.yml"
 #  roles:
 #    - common
@@ -50,6 +54,7 @@
 #  sudo: True
 #  vars_files:
 #    - "{{ secure_dir }}/vars/dev/dev2.yml"
+#    - "{{ secure_dir }}/vars/dev/common.yml"
 #    - "{{ secure_dir }}/vars/users.yml"
 #  roles:
 #    - common

playbooks/edx-east/edx_feanilsandbox.yml

@@ -3,6 +3,7 @@
   sudo: True
   vars_files:
     - "{{ secure_dir }}/vars/dev/feanilsandbox.yml"
+    - "{{ secure_dir }}/vars/dev/common.yml"
     - "{{ secure_dir }}/vars/common/common.yml"
     - "{{ secure_dir }}/vars/users.yml"
   roles:
@@ -18,6 +19,7 @@
   sudo: True
   vars_files:
     - "{{ secure_dir }}/vars/dev/feanilsandbox.yml"
+    - "{{ secure_dir }}/vars/dev/common.yml"
     - "{{ secure_dir }}/vars/common/common.yml"
     - "{{ secure_dir }}/vars/users.yml"
   roles:
@@ -32,6 +34,7 @@
   sudo: True
   vars_files:
     - "{{ secure_dir }}/vars/dev/feanilsandbox.yml"
+    - "{{ secure_dir }}/vars/dev/common.yml"
     - "{{ secure_dir }}/vars/users.yml"
   roles:
     - common
@@ -42,6 +45,7 @@
   sudo: True
   vars_files:
     - "{{ secure_dir }}/vars/dev/feanilsandbox.yml"
+    - "{{ secure_dir }}/vars/dev/common.yml"
     - "{{ secure_dir }}/vars/users.yml"
   roles:
     - common
@@ -50,6 +54,7 @@
   sudo: True
   vars_files:
     - "{{ secure_dir }}/vars/dev/feanilsandbox.yml"
+    - "{{ secure_dir }}/vars/dev/common.yml"
     - "{{ secure_dir }}/vars/users.yml"
   roles:
     - common

playbooks/roles/edxapp/defaults/main.yml

@@ -10,8 +10,9 @@
 
 # These are custom variables that can be overridden
 # on the command line to change specific values in the hash
-c_lms_base: ''
-c_preview_lms_base: ''
+LMS_BASE: ''
+PREVIEW_LMS_BASE: ''
+CMS_BASE: ''
 
 #Use YAML references (& and *) and hash merge <<: to factor out shared settings
 #see http://atechie.net/2009/07/merging-hashes-in-yaml-conf-files/
@@ -72,7 +73,8 @@ edxapp_generic_auth_config:  &edxapp_generic_auth
   'CELERY_BROKER_PASSWORD': ''
 
 generic_env_config:  &edxapp_generic_env
-  'LMS_BASE': "{{ c_lms_base }}"
+  'LMS_BASE': "{{LMS_BASE}}"
+  'CMS_BASE': "{{CMS_BASE}}"
   'BOOK_URL':  ''
   'CERT_QUEUE':  'certificates'
   'LOCAL_LOGLEVEL':  'INFO'
@@ -86,7 +88,7 @@ generic_env_config:  &edxapp_generic_env
     'ENABLE_PEARSON_HACK_TEST': false
     'SUBDOMAIN_BRANDING': false
     'SUBDOMAIN_COURSE_LISTINGS': false
-    'PREVIEW_LMS_BASE': "{{ c_preview_lms_base }}"
+    'PREVIEW_LMS_BASE': "{{PREVIEW_LMS_BASE}}"
   'WIKI_ENABLED': true
   'SYSLOG_SERVER':  'syslog.a.m.i4x.org'
   'SITE_NAME':  'example.com'