Stanford config/xqueue updates and local mods

* Changed the way xqueue does basic auth configuration so that it would
  work with the old httplib on our prod ora instances.
* this breaks the .org release's method of doing basic auth, but that
  doesn't matter for Stanford because we do it differently

playbooks/edx-west/carnegie-prod-app.yml

 - hosts: ~tag_Name_app(10|20)_carn
+#- hosts: ~tag_Name_app20_carn
   sudo: True
   vars_prompt:
     - name: "migrate_db"

playbooks/edx-west/cme-prod-app.yml

@@ -14,6 +14,7 @@
 #- hosts: tag_environment_prod:&tag_function_webserver
 # or we can get subsets of them by name
 - hosts: ~tag_Name_app(10|20)_cme
+#- hosts: ~tag_Name_app10_cme
   sudo: True
   vars_prompt:
     - name: "migrate_db"
@@ -32,6 +33,7 @@
     - "{{ secure_dir }}/vars/edxapp_prod_users.yml"
     - "{{ secure_dir }}/vars/datadog_stage.yml"
   roles:
+    #- ansible_debug
     - common
     - role: nginx
       nginx_conf: true

playbooks/edx-west/prod-app.yml

 # this gets all running prod webservers
 #- hosts: tag_environment_prod:&tag_function_webserver
 # or we can get subsets of them by name
-- hosts: ~tag_Name_app(10|20)_prod
+#- hosts: ~tag_Name_app(10|20)_prod
 #- hosts: ~tag_Name_app(11|21)_prod
 ## this is the test box
-#- hosts: ~tag_Name_app4_prod
+- hosts: ~tag_Name_app4_prod
 ## you can also do security group, but don't do that
 #- hosts: security_group_edx-prod-EdxappServerSecurityGroup-NSKCQTMZIPQB
   sudo: True

playbooks/edx-west/prod-jumpbox.yml

@@ -2,8 +2,10 @@
   sudo: True
   vars_files:
     - "{{ secure_dir }}/vars/users_jumpbox.yml"
+    - "{{ secure_dir }}/vars/datadog_stage.yml"
   vars:
     secure_dir: '../../../configuration-secure/ansible'
     local_dir:  '../../../configuration-secure/ansible/local'
   roles:
     - common
+    - datadog

playbooks/edx-west/prod-worker.yml

 # For all util machines
 - hosts: tag_environment_prod:&tag_function_util
 # or we can get subsets of them by name
-#- hosts: ~tag_Name_util(1|2)_prod
+#- hosts: ~tag_Name_util20_prod
   sudo: True
   vars:
     secure_dir: '../../../configuration-secure/ansible'

playbooks/edx-west/prod-xqueue.yml

@@ -19,6 +19,7 @@
     - role: nginx
       nginx_sites:
       - xqueue
+      - basic-auth
     - xqueue
     - datadog
     #- splunkforwarder

playbooks/edx-west/stage-xqueue.yml

@@ -14,6 +14,7 @@
     - role: nginx
       nginx_sites:
       - xqueue
+      - basic-auth
     - xqueue
     - datadog
     #- splunkforwarder

playbooks/roles/nginx/templates/basic-auth.j2

+server {
+  listen 80;
+  location / {
      auth_basic            "Restricted";
      auth_basic_user_file  /etc/nginx/nginx.htpasswd;
-     root {{ app_base_dir }}/main_static;
+     root {{app_base_dir}}/main_static;
      index index.html
      proxy_set_header X-Forwarded-Proto https;
+  }
+}

playbooks/roles/nginx/templates/xqueue.j2

@@ -8,9 +8,6 @@ server {
   listen {{ XQUEUE_NGINX_PORT }} default_server;
 
   location / {
-    {% if  XQUEUE_BASIC_AUTH %}
-        {% include "basic-auth.j2" %}
-    {% endif %}
     try_files $uri @proxy_to_app;
   }