Merge pull request #1233 from edx/jarv/add-analytics-to-sandbox

Jarv/add analytics to sandbox

playbooks/edx-east/edx_continuous_integration.yml

@@ -33,6 +33,7 @@
     - ora
     - certs
     - edx_ansible
+    - analytics-api
     - role: datadog
       when: COMMON_ENABLE_DATADOG
     - role: splunkforwarder

playbooks/roles/analytics-api/defaults/main.yml

@@ -62,6 +62,8 @@ ANALYTICS_API_CONFIG:
   EMAIL_PORT: 587
   API_AUTH_TOKEN: 'put-your-api-token-here'
   # db config
+  DATABASE_OPTIONS:
+    connect_timeout: 10
   DATABASES:
     # rw user
     default:

playbooks/roles/edx_ansible/templates/update.j2

@@ -12,7 +12,7 @@ IFS=","
             -v        add verbosity to edx_ansible run
             -h        this
 
-    <repo> - must be one of edx-platform, xqueue, cs_comments_service, xserver, ease, edx-ora, configuration, read-only-certificate-code
+    <repo> - must be one of edx-platform, xqueue, cs_comments_service, xserver, ease, edx-ora, configuration, read-only-certificate-code edx-analytics-data-api
     <version> - can be a commit or tag
 
 EO
@@ -49,6 +49,7 @@ repos_to_cmd["ease"]="$edx_ansible_cmd discern.yml -e 'discern_ease_version=$2'
 repos_to_cmd["edx-ora"]="$edx_ansible_cmd ora.yml -e 'ora_version=$2'"
 repos_to_cmd["configuration"]="$edx_ansible_cmd edx_ansible.yml -e 'configuration_version=$2'"
 repos_to_cmd["read-only-certificate-code"]="$edx_ansible_cmd certs.yml -e 'certs_version=$2'"
+repos_to_cmd["edx-analytics-data-api"]="$edx_ansible_cmd analyticsapi.yml -e 'ANALYTICS_API_VERSION=$2'"
 
 
 if [[ -z $1 || -z $2 ]]; then

util/jenkins/ansible-provision.sh

@@ -217,7 +217,7 @@ if [[ $reconfigure == "true" || $server_type == "full_edx_installation_from_scra
     ansible-playbook edx_continuous_integration.yml -i "${deploy_host}," $extra_var_arg --user ubuntu
 fi
 
-if [[ $server_type == "full_edx_installation" ]]; then
+if [[ $reconfigure != "true" && $server_type == "full_edx_installation" ]]; then
     # Run deploy tasks for the roles selected
     for i in $roles; do
         if [[ ${deploy[$i]} == "true" ]]; then