final fixups

playbooks/roles/insights/defaults/main.yml

@@ -57,7 +57,7 @@ INSIGHTS_DATABASES:
 #
 # This block of config is dropped into /edx/etc/insights.yml
 # and is read in by analytics_dashboard/settings/production.py
-INSIGHTS_SERVICE_CONFIG:
+INSIGHTS_CONFIG:
   SUPPORT_URL: '{{ INSIGHTS_SUPPORT_URL }}'
   DOCUMENTATION_LOAD_ERROR_URL: '{{ INSIGHTS_DOC_BASE }}/Reference.html#error-conditions'
   SEGMENT_IO_KEY: '{{ INSIGHTS_SEGMENT_IO_KEY }}'
@@ -117,20 +117,20 @@ INSIGHTS_REPOS:
     REPO: edx-analytics-dashboard.git
     VERSION: "{{ INSIGHTS_VERSION }}"
     DESTINATION: "{{ insights_code_dir }}"
-    SSH_KEY: "{{ INSIGHTS_GIT_IDENTITY }}
+    SSH_KEY: "{{ INSIGHTS_GIT_IDENTITY }}"
 
 #
 # vars are namespace with the module name.
 #
 insights_environment:
   DJANGO_SETTINGS_MODULE: "analytics_dashboard.settings.production"
-  ANALYTICS_DASHBOARD_CFG: "{{ COMMON_CFG_DIR  }}/{{ insights_service_name }}.yaml"
+  ANALYTICS_DASHBOARD_CFG: "{{ COMMON_CFG_DIR  }}/{{ insights_service_name }}.yml"
 
 insights_service_name: insights
 insights_user: "{{ insights_service_name }}"
 insights_app_dir: "{{ COMMON_APP_DIR }}/{{ insights_service_name }}"
 insights_home: "{{ COMMON_APP_DIR }}/{{ insights_service_name }}"
-insights_code_dir: "{{ insights_app_dir }}/edx-analytics-dashboard"
+insights_code_dir: "{{ insights_app_dir }}/edx_analytics_dashboard"
 insights_python_path: "{{ insights_code_dir }}/analytics_dashboard"
 insights_conf_dir: "{{ insights_home }}"
 insights_log_dir: "{{ COMMON_LOG_DIR }}/{{ insights_service_name }}"

playbooks/roles/insights/meta/main.yml

@@ -13,7 +13,7 @@
 dependencies:
   - role: edx_service
     edx_service_name: "{{ insights_service_name }}"
-    edx_service_config: "{{ INSIGHTS_SERVICE_CONFIG }}"
+    edx_service_config: "{{ INSIGHTS_CONFIG }}"
     edx_service_repos: "{{ INSIGHTS_REPOS }}"
     edx_service_user: "{{ insights_user }}"
     edx_service_home: "{{ insights_home }}"

playbooks/roles/insights/tasks/main.yml

@@ -123,4 +123,13 @@
   file: >
     src="{{ insights_manage }}"
     dest="{{ COMMON_BIN_DIR }}/manage.{{ insights_service_name }}"
-    state=link
\ No newline at end of file
+    state=link
+
+- name: restart insights
+  supervisorctl_local: >
+    state=restarted
+    supervisorctl_path={{ supervisor_ctl }}
+    config={{ supervisor_cfg }}
+    name={{ insights_service_name }}
+  when: not disable_edx_services
+  sudo_user: "{{ supervisor_service_user }}"
\ No newline at end of file

playbooks/roles/insights/templates/edx/app/insights/insights.sh.j2

@@ -2,7 +2,7 @@
 
 # {{ ansible_managed }}
 
-{% set insights_venv_bin = insights_home + '/venvs' + insights_service_name + '/bin' }
+{% set insights_venv_bin = insights_home + '/venvs/' + insights_service_name + '/bin' %}
 {% if COMMON_ENABLE_NEWRELIC_APP %}
 {% set executable = insights_venv_bin + '/newrelic-admin run-program ' + insights_venv_bin + '/gunicorn' %}
 {% else %}