Merge pull request #306 from edx/jbau/edx-west/shib-and-notifier-role

a potporri of edx-west fixes

playbooks/edx-west/stage-app.yml

@@ -14,10 +14,10 @@
     - "{{ secure_dir }}/vars/edxapp_stage_vars.yml"
     - "{{ secure_dir }}/vars/users.yml"
     - "{{ secure_dir }}/vars/edxapp_stage_users.yml"
-    #- "{{ secure_dir }}/vars/shib_stage_vars.yml"
+    - "{{ secure_dir }}/vars/shib_stage_vars.yml"
   roles:
     - common
     - nginx
     - edxapp
-    #- apache
-    #- shibboleth
+    - apache
+    - shibboleth

playbooks/edx-west/stage-debug.yml

+- hosts: localhost
+#- hosts: tag_Name_app1_stage
+  vars:
+    migrate_db: "no"
+    not_prod: true
+    secure_dir: ../../../edx-secret/ansible
+    local_dir: ../../../edx-secret/ansible/local
+  vars_files:
+    - "{{ secure_dir }}/vars/edxapp_stage_vars.yml"
+    - "{{ secure_dir }}/vars/users.yml"
+    - "{{ secure_dir }}/vars/edxapp_stage_users.yml"
+    #- "{{ secure_dir }}/vars/shib_stage_vars.yml"
+  roles:
+    - common
+    - nginx
+    - edxapp
+    - ansible_debug
+    #- apache
+    #- shibboleth

playbooks/edx-west/stage-notifier-only.yml

+# run the notifier on the first util machine only
+- hosts: ~tag_Name_util10_stage
+  sudo: True
+  vars:
+    secure_dir: '../../../configuration-secure/ansible'
+    migrate_db: "no"
+  vars_files:
+    - "{{ secure_dir }}/vars/edxapp_stage_vars.yml"
+    - "{{ secure_dir }}/vars/notifier_stage_vars.yml"
+  roles:
+    - role: virtualenv
+      virtualenv_user: "notifier"
+      virtualenv_user_home: "/opt/wwc/notifier"
+      virtualenv_name: "notifier"
+    - notifier

playbooks/edx-west/stage-worker.yml

-# this gets all running stage util machiens
+  # this gets all running stage util machiens
 - hosts: tag_environment_stage:&tag_function_util
 # or we can get subsets of them by name
 #- hosts: ~tag_Name_util(1|2)_stage

playbooks/roles/shibboleth/templates/shibboleth2.xml.j2

@@ -43,7 +43,7 @@
     -->
 
     <!-- The ApplicationDefaults element is where most of Shibboleth's SAML bits are defined. -->
-    <ApplicationDefaults entityID="{{shib.sp_entity_id}}" REMOTE_USER="eppn persistent-id targeted-id">
+    <ApplicationDefaults entityID="{{shib.sp_entity_id}}" REMOTE_USER="eppn">
         <!--
         Controls session lifetimes, address checks, cookie handling, and the protocol handlers.
         You MUST supply an effectively unique handlerURL value for each of your applications.