Address comments

playbooks/roles/edxapp/defaults/main.yml

@@ -78,8 +78,11 @@ EDXAPP_ELASTIC_SEARCH_CONFIG:
     - host: "localhost"
       port: 9200
 
-EDXAPP_LMS_ENV_FILE: 'lms.envs.aws'
-EDXAPP_CMS_ENV_FILE: 'cms.envs.aws'
+EDXAPP_LMS_ENV: 'lms.envs.aws'
+EDXAPP_CMS_ENV: 'cms.envs.aws'
+
+EDXAPP_LMS_ENV_FILE: "lms_env"
+EDXAPP_CMS_ENV_FILE: "cms_env"
 
 EDXAPP_EMAIL_BACKEND: 'django.core.mail.backends.smtp.EmailBackend'
 EDXAPP_EMAIL_HOST: 'localhost'
@@ -644,14 +647,14 @@ edxapp_lms_environment:
   <<: *edxapp_common_environment
   PORT: "{{ edxapp_lms_gunicorn_port }}"
   ADDRESS: "{{ edxapp_lms_gunicorn_host }}"
-  DJANGO_SETTINGS_MODULE: "{{ EDXAPP_LMS_ENV_FILE }}"
+  DJANGO_SETTINGS_MODULE: "{{ EDXAPP_LMS_ENV }}"
   SERVICE_VARIANT: lms
 
 edxapp_cms_environment:
   <<: *edxapp_common_environment
   PORT: "{{ edxapp_cms_gunicorn_port }}"
   ADDRESS: "{{ edxapp_cms_gunicorn_host }}"
-  DJANGO_SETTINGS_MODULE: "{{ EDXAPP_CMS_ENV_FILE }}"
+  DJANGO_SETTINGS_MODULE: "{{ EDXAPP_CMS_ENV }}"
   SERVICE_VARIANT: cms
 
 

playbooks/roles/edxapp/tasks/deploy.yml

-- name: setup the lms env
+- name: setup the env files
   template: >
-    src=lms_env.j2 dest={{ edxapp_app_dir }}/{{ EDXAPP_LMS_ENV_FILE }}
-    owner={{ edxapp_user }}  group={{ common_web_user }}
-    mode=0644
-  tags:
-    - install
-    - install:configuration
-
-- name: setup the cms env
-  template: >
-    src=cms_env.j2 dest={{ edxapp_app_dir }}/{{ EDXAPP_CMS_ENV_FILE }}
+    src={{ item.template }} dest={{ edxapp_app_dir }}/{{ item.file }}
     owner={{ edxapp_user }}  group={{ common_web_user }}
     mode=0644
+  with_items:
+    - { template: lms_env.j2, file: "{{ EDXAPP_LMS_ENV_FILE }}" }
+    - { template: cms_env.j2, file: "{{ EDXAPP_CMS_ENV_FILE }}" }
   tags:
     - install
     - install:configuration

playbooks/roles/edxapp/tasks/main.yml

@@ -26,7 +26,7 @@
   tags:
     - install
     - install:base
-    
+
 # var should have more permissive permissions than the rest
 - name: create edxapp var dir
   file: >