Merge pull request #1156 from edx/jarv/run-ip

adding the option to run on a single ip

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

 [program:xqueue]
 
 {% if COMMON_ENABLE_NEWRELIC %}
-{% set executable = xqueue_venv_dir + '/bin/newrelic-admin run-program ' + xqueue_venv_dir + '/bin/gunicorn' %}
+{% set executable = xqueue_venv_bin + '/newrelic-admin run-program ' + xqueue_venv_bin + '/gunicorn' %}
 {% else %}
-{% set executable = xqueue_venv_dir + '/bin/gunicorn' %}
+{% set executable = xqueue_venv_bin + '/gunicorn' %}
 {% endif %}
 
 {% if ansible_processor|length > 0 %}
-command={{ xqueue_venv_bin }}/gunicorn --preload -b {{ xqueue_gunicorn_host }}:{{ xqueue_gunicorn_port }} -w {{ ansible_processor|length * 2 }} --timeout=300 --pythonpath={{ xqueue_code_dir }} xqueue.wsgi
+command={{ executable }} --preload -b {{ xqueue_gunicorn_host }}:{{ xqueue_gunicorn_port }} -w {{ ansible_processor|length * 2 }} --timeout=300 --pythonpath={{ xqueue_code_dir }} xqueue.wsgi
 {% else %}
-command={{ xqueue_venv_bin }}/gunicorn --preload -b {{ xqueue_gunicorn_host }}:{{ xqueue_gunicorn_port }} -w 2 --timeout=300 --pythonpath={{ xqueue_code_dir }} xqueue.wsgi
+command={{ executable }} --preload -b {{ xqueue_gunicorn_host }}:{{ xqueue_gunicorn_port }} -w 2 --timeout=300 --pythonpath={{ xqueue_code_dir }} xqueue.wsgi
 {% endif %}
 
 user={{ common_web_user }}

util/jenkins/run-ansible.sh

@@ -31,12 +31,14 @@ if [[ $run_migrations == "true" ]]; then
       ansible_extra_vars+=" -e migrate_db=yes"
 fi
 
-if [[ $first_in == "true" ]]; then
-    ansible_limit+="first_in_"
+if [[ ! -z "$run_on_single_ip" ]]; then
+    ansible_limit+="$run_on_single_ip"
+else
+    if [[ $first_in == "true" ]]; then
+        ansible_limit+="first_in_"
+    fi
+    ansible_limit+="tag_Name_${environment_tag}-${deployment_tag}-${play_tag}"
 fi
-ansible_limit+="tag_Name_${environment_tag}-${deployment_tag}-${play_tag}"
-
-ansible_task_tags=""
 
 if [[ ! -z "$task_tags" ]]; then
     ansible_task_tags+="--tags $task_tags"