Fix analytics name when calling play

Also cleaned up roles to plays to better indicate what they map to

playbooks/roles/analytics_api/defaults/main.yml

@@ -144,7 +144,7 @@ analytics_api_service_config_overrides:
   LMS_BASE_URL: "{{ ANALYTICS_API_LMS_BASE_URL | default('http://127.0.0.1:8000') }}"
 
   # db config
-  ANALYTICS_DATABASE: ANALYTICS_API_REPORTS_DB_NAME
+  ANALYTICS_DATABASE: '{{ ANALYTICS_API_REPORTS_DB_NAME }}'
   DATABASES: '{{ ANALYTICS_API_DATABASES }}'
   ELASTICSEARCH_LEARNERS_HOST: '{{ ANALYTICS_API_ELASTICSEARCH_LEARNERS_HOST }}'
   ELASTICSEARCH_LEARNERS_INDEX: '{{ ANALYTICS_API_ELASTICSEARCH_LEARNERS_INDEX }}'

util/jenkins/ansible-provision.sh

@@ -377,22 +377,22 @@ veda_encode_worker=${video_encode_worker:-false}
 video_pipeline_integration=${video_pipeline:-false}
 
 declare -A deploy
-roles="edxapp forum ecommerce credentials discovery analytics_api veda_web_frontend veda_pipeline_worker veda_encode_worker video_pipeline_integration notifier xqueue xserver certs demo testcourses"
+plays="edxapp forum ecommerce credentials discovery analyticsapi veda_web_frontend veda_pipeline_worker veda_encode_worker video_pipeline_integration notifier xqueue xserver certs demo testcourses"
 
-for role in $roles; do
-    deploy[$role]=${!role}
+for play in $plays; do
+    deploy[$play]=${!play}
 done
 
 # If reconfigure was selected or if starting from an ubuntu 16.04 AMI
-# run non-deploy tasks for all roles
+# run non-deploy tasks for all plays
 if [[ $reconfigure == "true" || $server_type == "full_edx_installation_from_scratch" ]]; then
     cat $extra_vars_file
     run_ansible edx_continuous_integration.yml -i "${deploy_host}," $extra_var_arg --user ubuntu
 fi
 
 if [[ $reconfigure != "true" && $server_type == "full_edx_installation" ]]; then
-    # Run deploy tasks for the roles selected
-    for i in $roles; do
+    # Run deploy tasks for the plays selected
+    for i in $plays; do
         if [[ ${deploy[$i]} == "true" ]]; then
             cat $extra_vars_file
             run_ansible ${i}.yml -i "${deploy_host}," $extra_var_arg --user ubuntu
@@ -403,7 +403,7 @@ if [[ $reconfigure != "true" && $server_type == "full_edx_installation" ]]; then
     done
 fi
 
-# deploy the edx_ansible role
+# deploy the edx_ansible play
 run_ansible edx_ansible.yml -i "${deploy_host}," $extra_var_arg --user ubuntu
 cat $sandbox_secure_vars_file $sandbox_internal_vars_file $extra_vars_file | grep -v -E "_version|migrate_db" > ${extra_vars_file}_clean
 ansible -c ssh -i "${deploy_host}," $deploy_host -m copy -a "src=${extra_vars_file}_clean dest=/edx/app/edx_ansible/server-vars.yml" -u ubuntu -b