Revert "Try refactoring out localhost on analytics_api"

This reverts commit 2f392cfc.

playbooks/roles/analytics_api/defaults/main.yml

@@ -29,7 +29,7 @@ ANALYTICS_API_DATABASES:
     NAME: '{{ ANALYTICS_API_DEFAULT_DB_NAME }}'
     USER: 'api001'
     PASSWORD: 'password'
-    HOST: '{{ analytics_api_db_default_hostname }}'
+    HOST: 'localhost'
     PORT: '3306'
   # read-only user
   reports:
@@ -37,7 +37,7 @@ ANALYTICS_API_DATABASES:
     NAME: '{{ ANALYTICS_API_REPORTS_DB_NAME }}'
     USER: 'reports001'
     PASSWORD: 'password'
-    HOST: '{{ analytics_api_db_reports_hostname }}'
+    HOST: 'localhost'
     PORT: '3306'
 
 ANALYTICS_API_VERSION: "master"
@@ -45,27 +45,10 @@ ANALYTICS_API_VERSION: "master"
 ANALYTICS_API_USERS:
   "dummy-api-user": "changeme"
 
-#on docker, use {{ analytics_api_service_name }}
-ANALYTICS_API_HOSTNAME: ""
-
-#on docker, use {{ analytics_api_service_name }}-default-mysql
-ANALYTICS_API_DB_DEFAULT_HOSTNAME: ""
-
-# on docker, use {{ analytics_api_service_name }}-reports-mysql
-ANALYTICS_API_DB_REPORTS_HOSTNAME: ""
-
-#on docker, use {{ analytics_api_service_name }}-email
-ANALYTICS_API_EMAIL_HOSTNAME: ""
-
-#common_domain is "localhost", or ".local.edx.org" on docker
-ANALYTICS_API_FQDN: "{{ ANALYTICS_API_HOSTNAME }}{{ COMMON_DOMAIN }}"
-ANALYTICS_API_DB_DEFAULT_FQDN: "{{ ANALYTICS_API_DB_DEFAULT_HOSTNAME }}{{ COMMON_DOMAIN }}"
-ANALYTICS_API_DB_REPORTS_FQDN: "{{ ANALYTICS_API_DB_REPORTS_HOSTNAME }}{{ COMMON_DOMAIN }}"
-ANALYTICS_API_EMAIL_FQDN: "{{ ANALYTICS_API_EMAIL_HOSTNAME }}{{ COMMON_DOMAIN }}"
-
 ANALYTICS_API_SECRET_KEY: 'Your secret key here'
 ANALYTICS_API_TIME_ZONE: 'UTC'
 ANALYTICS_API_LANGUAGE_CODE: 'en-us'
+ANALYTICS_API_EMAIL_HOST: 'localhost'
 ANALYTICS_API_EMAIL_HOST_USER: 'mail_user'
 ANALYTICS_API_EMAIL_HOST_PASSWORD: 'mail_password'
 ANALYTICS_API_EMAIL_PORT: 587
@@ -77,7 +60,7 @@ ANALYTICS_API_SERVICE_CONFIG:
   TIME_ZONE: '{{ ANALYTICS_API_TIME_ZONE }}'
   LANGUAGE_CODE: '{{ANALYTICS_API_LANGUAGE_CODE }}'
   # email config
-  EMAIL_HOST: '{{ ANALYTICS_API_EMAIL_HOSTNAME }}'
+  EMAIL_HOST: '{{ ANALYTICS_API_EMAIL_HOST }}'
   EMAIL_HOST_PASSWORD: '{{ ANALYTICS_API_EMAIL_HOST_PASSWORD }}'
   EMAIL_HOST_USER: '{{ ANALYTICS_API_EMAIL_HOST_USER }}'
   EMAIL_PORT: '{{ ANALYTICS_API_EMAIL_PORT }}'

playbooks/roles/common_vars/defaults/main.yml

@@ -3,9 +3,6 @@
 # to change the base directory
 # where edX is installed
 
-#In docker, set to .local.edx.org (NOTICE LEADING .)
-COMMON_DOMAIN: localhost
-
 # Set global htpasswd credentials
 COMMON_ENABLE_BASIC_AUTH: False
 COMMON_HTPASSWD_USER: edx