Begin referencing environment and deployment instead of env_type and env_name.

playbooks/roles/common/defaults/main.yml

@@ -13,8 +13,8 @@ COMMON_LOG_DIR: "{{ COMMON_DATA_DIR }}/log"
 COMMON_BIN_DIR: "{{ COMMON_BASE_DIR }}/bin"
 COMMON_CFG_DIR: "{{ COMMON_BASE_DIR }}/etc"
 
-COMMON_ENV_NAME: 'default_env'
-COMMON_ENV_TYPE: 'default_type'
+COMMON_ENVIRONMENT: 'default_env'
+COMMON_DEPLOYMENT: 'default_deployment'
 COMMON_PYPI_MIRROR_URL: 'https://pypi.python.org/simple'
 # do not include http/https
 COMMON_GIT_MIRROR: 'github.com'

playbooks/roles/legacy_ora/tasks/main.yml

@@ -18,14 +18,14 @@
 
 - name: create ora application config
   copy:
-    src={{secure_dir}}/files/{{COMMON_ENV_TYPE}}/legacy_ora/ora.env.json
+    src={{secure_dir}}/files/{{COMMON_ENVIRONMENT}}/legacy_ora/ora.env.json
     dest={{ora_app_dir}}/env.json
   sudo_user: "{{ ora_user }}"
   register: env_state
 
 - name: create ora auth file
   copy:
-    src={{secure_dir}}/files/{{COMMON_ENV_TYPE}}/legacy_ora/ora.auth.json
+    src={{secure_dir}}/files/{{COMMON_ENVIRONMENT}}/legacy_ora/ora.auth.json
     dest={{ora_app_dir}}/auth.json
   sudo_user: "{{ ora_user }}"
   register: auth_state

playbooks/roles/splunkforwarder/defaults/main.yml

@@ -25,15 +25,15 @@ SPLUNKFORWARDER_PASSWORD: !!null
 SPLUNKFORWARDER_LOG_ITEMS:
   - directory: '{{ COMMON_LOG_DIR }}'
     recursive: true
-    index: '{{COMMON_ENV_TYPE}}-{{COMMON_ENV_NAME}}'
+    index: '{{COMMON_ENVIRONMENT}}-{{COMMON_DEPLOYMENT}}'
     sourcetype: 'edx'
   - directory: '/var/log'
     recursive: true
-    index: '{{COMMON_ENV_TYPE}}-{{COMMON_ENV_NAME}}'
+    index: '{{COMMON_ENVIRONMENT}}-{{COMMON_DEPLOYMENT}}'
     sourcetype: 'syslog'
   - directory: '{{ COMMON_LOG_DIR }}/nginx'
     recursive: true
-    index: '{{COMMON_ENV_TYPE}}-{{COMMON_ENV_NAME}}'
+    index: '{{COMMON_ENVIRONMENT}}-{{COMMON_DEPLOYMENT}}'
     sourcetype: 'nginx'
 
 #