small cleanup

playbooks/roles/analytics_api/defaults/main.yml

@@ -11,13 +11,7 @@
 # Defaults for role analytics_api
 #
 
-#
-# vars are namespace with the module name.
-#
-ANALYTICS_API_GIT_IDENTITY: |
-  -----BEGIN RSA PRIVATE KEY-----
-  Your key if you need to access any private repositories
-  -----END RSA PRIVATE KEY-----
+ANALYTICS_API_GIT_IDENTITY: !!null
 
 # depends upon Newrelic being enabled via COMMON_ENABLE_NEWRELIC
 # and a key being provided via NEWRELIC_LICENSE_KEY
@@ -30,7 +24,6 @@ ANALYTICS_API_PIP_EXTRA_ARGS: "-i {{ COMMON_PYPI_MIRROR_URL }}"
 analytics_api_role_name: "analytics_api"
 analytics_api_service_name: "analytics_api"
 analytics_api_user: "analytics_api"
-analytics_api_module: "xqueue_watcher"
 
 analytics_api_app_dir: "{{ COMMON_APP_DIR }}/{{ analytics_api_service_name }}"
 analytics_api_home: "{{ COMMON_APP_DIR }}/{{ analytics_api_service_name }}"

playbooks/roles/analytics_api/tasks/deploy.yml

@@ -15,7 +15,6 @@
   pip: >
     requirements="{{ analytics_api_requirements_base }}/{{ item }}"
     virtualenv="{{ analytics_api_venv_dir }}" state=present
-  sudo: true
   sudo_user: "{{ analytics_api_user }}"
   with_items: analytics_api_requirements
 
@@ -45,8 +44,6 @@
     force=yes
   when: not disable_edx_services
 
-  #
-  # Needs review
 - name: update supervisor configuration
   shell: "{{ supervisor_ctl }} -c {{ supervisor_cfg }} update"
   when: not disable_edx_services

playbooks/roles/analytics_api/tasks/main.yml

@@ -32,4 +32,7 @@
 # ansible-playbook -i 'api.example.com,' ./analytics_api.yml  -e@/ansible/vars/deployment.yml -e@/ansible/vars/env-deployment.yml
 #
 
-- include: deploy.yml tags=deploy
+- fail: msg="You must provide an private key for the analytics repo"
\ No newline at end of file
+  when: not ANALYTICS_API_GIT_IDENTITY
+
+- include: deploy.yml tags=deploy