merge conflict, missed updates

playbooks/roles/discovery/defaults/main.yml

@@ -95,7 +95,7 @@ DISCOVERY_SERVICE_CONFIG:
 
   PLATFORM_NAME: '{{ DISCOVERY_PLATFORM_NAME }}'
 
-  ECOMMERCE_API_URL: '{{ COURSE_DISCOVERY_ECOMMERCE_API_URL }}'
+  ECOMMERCE_API_URL: '{{ DISCOVERY_ECOMMERCE_API_URL }}'
 
 
 DISCOVERY_REPOS:
@@ -127,13 +127,13 @@ discovery_venv_dir: "{{ discovery_home }}/venvs/{{ discovery_service_name }}"
 discovery_environment:
   DJANGO_SETTINGS_MODULE: "{{ DISCOVERY_DJANGO_SETTINGS_MODULE }}"
   # rename should synch with app
-  COURSE_DISCOVERY_CFG: "{{ COMMON_CFG_DIR }}/{{ discovery_service_name }}.yml"
+  DISCOVERY_CFG: "{{ COMMON_CFG_DIR }}/{{ discovery_service_name }}.yml"
   PATH: "{{ discovery_venv_dir }}/bin:{{ ansible_env.PATH }}"
 
 discovery_migration_environment:
   DJANGO_SETTINGS_MODULE: "{{ DISCOVERY_DJANGO_SETTINGS_MODULE }}"
   # rename should synch with app
-  COURSE_DISCOVERY_CFG: "{{ COMMON_CFG_DIR }}/{{ discovery_service_name }}.yml"
+  DISCOVERY_CFG: "{{ COMMON_CFG_DIR }}/{{ discovery_service_name }}.yml"
   PATH: "{{ discovery_venv_dir }}/bin:{{ ansible_env.PATH }}"
   DB_MIGRATION_USER: "{{ COMMON_MYSQL_MIGRATE_USER }}"
   DB_MIGRATION_PASS: "{{ COMMON_MYSQL_MIGRATE_PASS }}"