removing edxapp_newrelic_executable

playbooks/roles/edxapp/defaults/main.yml

@@ -214,7 +214,6 @@ EDXAPP_XML_S3_KEY: !!null
 
 EDXAPP_NEWRELIC_LMS_APPNAME: "edX-LMS"
 EDXAPP_NEWRELIC_CMS_APPNAME: "edX-CMS"
-edxapp_newrelic_executable: "{{ edxapp_venv_dir }}/bin/newrelic-admin"
 #-------- Everything below this line is internal to the role ------------
 
 #Use YAML references (& and *) and hash merge <<: to factor out shared settings

playbooks/roles/edxapp/templates/cms.conf.j2

 [program:cms]
 
 {% if COMMON_ENABLE_NEWRELIC %}
-{% set executable = edxapp_newrelic_executable + ' run-program ' + edxapp_venv_dir + '/bin/gunicorn' %}
+{% set executable = edxapp_venv_dir + '/bin/newrelic-admin run-program ' + edxapp_venv_dir + '/bin/gunicorn' %}
 {% else %}
 {% set executable = edxapp_venv_dir + '/bin/gunicorn' %}
 {% endif %}

playbooks/roles/edxapp/templates/lms.conf.j2

 [program:lms]
 
 {% if COMMON_ENABLE_NEWRELIC %}
-{% set executable = edxapp_newrelic_executable + ' run-program ' + edxapp_venv_dir + '/bin/gunicorn' %}
+{% set executable = edxapp_venv_dir + '/bin/newrelic-admin run-program ' + edxapp_venv_dir + '/bin/gunicorn' %}
 {% else %}
 {% set executable = edxapp_venv_dir + '/bin/gunicorn' %}
 {% endif %}

playbooks/roles/xqueue/templates/xqueue.conf.j2

 [program:xqueue]
 
 {% if COMMON_ENABLE_NEWRELIC %}
-{% set executable = edxapp_newrelic_executable + ' run-program ' + edxapp_venv_dir + '/bin/gunicorn' %}
+{% set executable = xqueue_venv_dir + '/bin/newrelic-admin run-program ' + xqueue_venv_dir + '/bin/gunicorn' %}
 {% else %}
-{% set executable = edxapp_venv_dir + '/bin/gunicorn' %}
+{% set executable = xqueue_venv_dir + '/bin/gunicorn' %}
 {% endif %}
 
 {% if ansible_processor|length > 0 %}