Merge pull request #2366 from edx/gabe/fix-edxlocal

Fix edxlocal when not running analytics stack build

playbooks/roles/analytics_pipeline/defaults/main.yml

@@ -11,6 +11,7 @@
 # Defaults for role analytics_pipeline
 #
 
+ANALYTICS_PIPELINE_OUTPUT_DATABASE_NAME: "{{ ANALYTICS_API_REPORTS_DB_NAME }}"
 ANALYTICS_PIPELINE_OUTPUT_DATABASE:
   username: pipeline001
   password: password

playbooks/roles/edxlocal/defaults/main.yml

@@ -50,12 +50,12 @@ edxlocal_database_users:
       pass: "{{ PROGRAMS_DATABASES.default.PASSWORD | default(None) }}"
     }
   - {
-      db: "{{ ANALYTICS_API_REPORTS_DB_NAME | default(None) }}",
-      user: "pipeline001",
-      pass: "password"
+      db: "{{ ANALYTICS_PIPELINE_OUTPUT_DATABASE_NAME | default(None) }}",
+      user: "{{ ANALYTICS_PIPELINE_OUTPUT_DATABASE.username }}",
+      pass: "{{ ANALYTICS_PIPELINE_OUTPUT_DATABASE.password }}"
     }
   - {
-      db: "{{ HIVE_METASTORE_DATABASE.name | default(None) }}",
+      db: "{{ HIVE_METASTORE_DATABASE_NAME | default(None) }}",
       user: "{{ HIVE_METASTORE_DATABASE.user | default(None) }}",
       pass: "{{ HIVE_METASTORE_DATABASE.password | default(None) }}"
     }

playbooks/roles/hive/defaults/main.yml

@@ -17,10 +17,11 @@ HIVE_HOME: "{{ HADOOP_COMMON_USER_HOME }}/hive"
 HIVE_CONF: "{{ HIVE_HOME }}/conf"
 HIVE_LIB: "{{ HIVE_HOME }}/lib"
 
+HIVE_METASTORE_DATABASE_NAME: edx_hive_metastore
 HIVE_METASTORE_DATABASE:
   user: edx_hive
   password: edx
-  name: edx_hive_metastore
+  name: "{{ HIVE_METASTORE_DATABASE_NAME }}"
   host: 127.0.0.1
   port: 3306