Merge pull request #1854 from edx/max/refactor-fixes

A few small fixes

playbooks/roles/analytics_api/meta/main.yml

@@ -26,4 +26,7 @@ dependencies:
     edx_service_repos: "{{ ANALYTICS_API_REPOS }}"
     edx_service_user: "{{ analytics_api_user }}"
     edx_service_home: "{{ analytics_api_home }}"
+    edx_service_packages:
+      debian: "{{ analytics_api_debian_pkgs }}"
+      redhat: "{{ analytics_api_redhat_pkgs }}"
   - supervisor

playbooks/roles/edx_notes_api/meta/main.yml

@@ -26,4 +26,7 @@ dependencies:
     edx_service_repos: "{{ EDX_NOTES_API_REPOS }}"
     edx_service_user: "{{ edx_notes_api_user }}"
     edx_service_home: "{{ edx_notes_api_home }}"
+    edx_service_packages:
+      debian: "{{ edx_notes_api_debian_pkgs }}"
+      redhat: "{{ edx_notes_api_redhat_pkgs }}"
   - supervisor

playbooks/roles/edx_notes_api/tasks/main.yml

@@ -120,3 +120,12 @@
     src="{{ edx_notes_api_manage }}"
     dest="{{ COMMON_BIN_DIR }}/manage.{{ edx_notes_api_service_name }}"
     state=link
+
+- name: restart edx_notes_api
+  supervisorctl_local: >
+    state=restarted
+    supervisorctl_path={{ supervisor_ctl }}
+    config={{ supervisor_cfg }}
+    name={{ edx_notes_api_service_name }}
+  when: not disable_edx_services
+  sudo_user: "{{ supervisor_service_user }}"

playbooks/roles/edx_service/defaults/main.yml

@@ -14,12 +14,11 @@
 #
 # vars are namespace with the module name.
 #
-edx_service_role_name: edx_service
+edx_service_name: edx_service
 
 #
 # OS packages
 #
-
-edx_service_debian_pkgs: []
-
-edx_service_redhat_pkgs: []
+edx_service_packages:
+  debian: []
+  redhat: []

playbooks/roles/edx_service/tasks/main.yml

@@ -93,17 +93,14 @@
     - deploy
   when: edx_service_config is defined
 
-# Replace dashes with underscores to support roles that use
-# dashes (the role vars will contain underscores)
-#TODO: REMOVE UNDERSCORE-TO-DASH CONVERSION ONCE ALL ROLES ARE NORMALIZED
 - name: install a bunch of system packages on which edx_service relies
   apt: pkg={{ item }} state=present
-  with_items: "{{ edx_service_name.replace('-', '_') }}_debian_pkgs"
+  with_items: edx_service_packages.debian
   when: ansible_distribution in common_debian_variants
 
 - name: install a bunch of system packages on which edx_service relies
   yum: pkg={{ item }} state=present
-  with_items: "{{ edx_service_name.replace('-', '_') }}_redhat_pkgs"
+  with_items: edx_service_name.redhat
   when: ansible_distribution in common_redhat_variants
 
 

playbooks/roles/insights/meta/main.yml

@@ -17,4 +17,7 @@ dependencies:
     edx_service_repos: "{{ INSIGHTS_REPOS }}"
     edx_service_user: "{{ insights_user }}"
     edx_service_home: "{{ insights_home }}"
+    edx_service_packages:
+      debian: "{{ insights_debian_pkgs }}"
+      redhat: "{{ insights_redhat_pkgs }}"
   - supervisor

playbooks/roles/minos/meta/main.yml

@@ -23,4 +23,7 @@ dependencies:
     edx_service_name: "{{ minos_service_name }}"
     edx_service_config: "{{ MINOS_SERVICE_CONFIG }}"
     edx_service_user: root
-    edx_service_home: "{{ minos_app_dir }}"
+    edx_service_home: "{{ minos_app_dir }}"
\ No newline at end of file
+    edx_service_packages:
+      debian: "{{ minos_debian_pkgs }}"
+      redhat: "{{ minos_redhat_pkgs }}"
\ No newline at end of file

playbooks/roles/minos/tasks/main.yml

@@ -75,7 +75,7 @@
     content="{{ MINOS_GIT_IDENTITY }}" dest="{{ minos_git_identity }}"
     force=yes mode=0600
 
-- name : install python custom-requirements
+- name: install python custom-requirements
   pip: >
     name="{{ item }}"
     virtualenv="{{ minos_app_dir }}/venvs/"

playbooks/roles/xqwatcher/meta/main.yml

@@ -18,6 +18,9 @@ dependencies:
     edx_service_repos: "{{ XQWATCHER_REPOS }}"
     edx_service_user: "{{ xqwatcher_user }}"
     edx_service_home: "{{ xqwatcher_app_dir }}"
+    edx_service_packages:
+        debian: "{{ xqwatcher_debian_pkgs }}"
+        redhat: "{{ xqwatcher_redhat_pkgs }}"
   - role: supervisor
     supervisor_app_dir: "{{ xqwatcher_supervisor_app_dir }}"
     supervisor_data_dir: "{{ xqwatcher_supervisor_data_dir }}"

playbooks/roles/xqwatcher/tasks/code_jail.yml

@@ -41,7 +41,7 @@
     mode=0440 owner=root group=root
   with_items: XQWATCHER_COURSES
 
-- name : install course specific python requirements
+- name: install course specific python requirements
   pip: >
     requirements="{{ xqwatcher_app_data }}/{{ item.QUEUE_CONFIG.HANDLERS[0].CODEJAIL.name }}-requirements.txt"
     virtualenv="{{ xqwatcher_app_dir }}/venvs/{{ item.QUEUE_CONFIG.HANDLERS[0].CODEJAIL.name }}"