Merge pull request #1890 from edx/feanil/fix_ci

Ansible fails in looking up keys inside the dictionary when the top leve...

playbooks/roles/analytics_api/defaults/main.yml

@@ -19,11 +19,14 @@ ANALYTICS_API_NEWRELIC_APPNAME: "{{ COMMON_ENVIRONMENT }}-{{ COMMON_DEPLOYMENT }
 ANALYTICS_API_PIP_EXTRA_ARGS: "-i {{ COMMON_PYPI_MIRROR_URL }}"
 ANALYTICS_API_NGINX_PORT: "18100"
 
+ANALYTICS_API_DEFAULT_DB_NAME: 'analytics-api'
+ANALYTICS_API_REPORTS_DB_NAME: 'reports'
+
 ANALYTICS_API_DATABASES:
   # rw user
   default:
     ENGINE: 'django.db.backends.mysql'
-    NAME: 'analytics-api'
+    NAME: '{{ ANALYTICS_API_DEFAULT_DB_NAME }}'
     USER: 'api001'
     PASSWORD: 'password'
     HOST: 'localhost'
@@ -31,7 +34,7 @@ ANALYTICS_API_DATABASES:
   # read-only user
   reports:
     ENGINE: 'django.db.backends.mysql'
-    NAME: 'reports'
+    NAME: '{{ ANALYTICS_API_REPORTS_DB_NAME }}'
     USER: 'reports001'
     PASSWORD: 'password'
     HOST: 'localhost'

playbooks/roles/edxlocal/tasks/main.yml

@@ -142,9 +142,9 @@
     - "{{ XQUEUE_MYSQL_DB_NAME|default('None') }}"
     - "{{ ORA_MYSQL_DB_NAME|default('None') }}"
     - "{{ EDX_NOTES_API_MYSQL_DB_NAME|default('None') }}"
-    - "{{ ANALYTICS_API_SERVICE_CONFIG['DATABASES']['default']['NAME']|default('None') }}"
-    - "{{ ANALYTICS_API_SERVICE_CONFIG['DATABASES']['reports']['NAME']|default('None') }}"
-    - "{{ INSIGHTS_DATABASES.default.NAME|default('None') }}"
+    - "{{ ANALYTICS_API_DEFAULT_DB_NAME|default('None') }}"
+    - "{{ ANALYTICS_API_REPORTS_DB_NAME|default('None') }}"
+    - "{{ INSIGHTS_DATABASE_NAME|default('None') }}"
 
 - name: setup the read-only db user
   mysql_user: >

playbooks/roles/insights/defaults/main.yml

@@ -44,11 +44,13 @@ INSIGHTS_THEME_SCSS: 'sass/themes/open-edx.scss'
 INSIGHTS_RESEARCH_URL: 'https://www.edx.org/research-pedagogy'
 INSIGHTS_OPEN_SOURCE_URL: 'http://set-me-please'
 
+INSIGHTS_DATABASE_NAME: 'dashboard'
+
 INSIGHTS_DATABASES:
   # rw user
   default:
     ENGINE: 'django.db.backends.mysql'
-    NAME: 'dashboard'
+    NAME: '{{ INSIGHTS_DATABASE_NAME }}'
     USER: 'rosencrantz'
     PASSWORD: 'secret'
     HOST: 'localhost'