Remove pre_supervisor upstart service OPS-1849

playbooks/edx-east/retire_host.yml

@@ -12,10 +12,6 @@
   hosts: "{{TARGET}}"
   become: True
   gather_facts: True
-  pre_tasks:
-    - set_fact:
-        STOP_ALL_EDX_SERVICES_EXTRA_ARGS: "--no-wait"
-      when: ansible_distribution_release == 'trusty'
   roles:
     - stop_all_edx_services
 

playbooks/roles/supervisor/tasks/main.yml

@@ -127,24 +127,6 @@
     - install
     - install:base
 
-# This script is aws specific and looks up instances
-# tags and enables services based on the 'services' tag
-# on instance startup.
-# TODO: 16.04 this cannot simply be dropped, enabling needs to be moved somewhere
-# also should not be here, should be in the aws role if it's aws specific
-- name: create pre_supervisor upstart job
-  template:
-    src: "etc/init/pre_supervisor.conf.j2"
-    dest: "/etc/init/pre_supervisor.conf"
-    owner: root
-    group: root
-  when: >
-    supervisor_service == "supervisor" and disable_edx_services and not devstack
-    and (ansible_distribution_release == 'trusty')
-  tags:
-    - to-remove
-    - aws-specfic
-
 # NB: with systemd, pre_supervisor is a pre-task for supervisor, not a separate service
 - name: Create supervisor systemd job
   template:

playbooks/roles/supervisor/templates/etc/init/pre_supervisor.conf.j2

-description     "Tasks before supervisord"
-
-start on runlevel [2345]
-task
-
-{% if credentials_code_dir is defined %}
-  {% set credentials_command = "--credentials-env " + credentials_home + "/credentials_env --credentials-code-dir " + credentials_code_dir + " --credentials-python " + COMMON_BIN_DIR + "/python.credentials" %}
-{% else %}
-  {% set credentials_command = "" %}
-{% endif %}
-
-{% if discovery_code_dir is defined %}
-  {% set discovery_command = "--discovery-env " + discovery_home + "/discovery_env --discovery-code-dir " + discovery_code_dir + " --discovery-python " + COMMON_BIN_DIR + "/python.discovery" %}
-{% else %}
-  {% set discovery_command = "" %}
-{% endif %}
-
-
-exec {{ supervisor_venv_dir }}/bin/python {{ supervisor_app_dir }}/pre_supervisor_checks.py --available={{ supervisor_available_dir }} --enabled={{ supervisor_cfg_dir }} {% if SUPERVISOR_HIPCHAT_API_KEY is defined %}--hipchat-api-key {{ SUPERVISOR_HIPCHAT_API_KEY }} --hipchat-room {{ SUPERVISOR_HIPCHAT_ROOM }} {% endif %} {% if edxapp_code_dir is defined %}--edxapp-python {{ COMMON_BIN_DIR }}/python.edxapp --edxapp-code-dir {{ edxapp_code_dir }} --edxapp-env {{ edxapp_app_dir }}/edxapp_env{% endif %} {% if xqueue_code_dir is defined %}--xqueue-code-dir {{ xqueue_code_dir }} --xqueue-python {{ COMMON_BIN_DIR }}/python.xqueue {% endif %} {% if ecommerce_code_dir is defined %}--ecommerce-env {{ ecommerce_home }}/ecommerce_env --ecommerce-code-dir {{ ecommerce_code_dir }} --ecommerce-python {{ COMMON_BIN_DIR }}/python.ecommerce {% endif %} {% if insights_code_dir is defined %}--insights-env {{ insights_home }}/insights_env --insights-code-dir {{ insights_code_dir }} --insights-python {{ COMMON_BIN_DIR }}/python.insights {% endif %} {% if analytics_api_code_dir is defined %}--analytics-api-env {{ analytics_api_home }}/analytics_api_env --analytics-api-code-dir {{ analytics_api_code_dir }} --analytics-api-python {{ COMMON_BIN_DIR }}/python.analytics_api {% endif %} {{ discovery_command }} {{ credentials_command }}