WIP messing around

playbooks/edx-west/edxapp_stage.yml

 - hosts: tag_environment_stage:&tag_function_webserver
   sudo: True
+  vars_prompt:
+    - name: "migrate_db"
+      prompt: "Should this playbook run database migrations? (<Return> for false, anything else for true)"
+      default: false
+      private: no
   vars:
     secure_dir: ../../../edx-secret/ansible
     local_dir: ../../../edx-secret/ansible/local
@@ -7,9 +12,11 @@
     - "{{ 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
-    # - gunicorn
     - edxapp
+    - apache
+    - shibboleth
     #- in_production

playbooks/roles/edxapp/tasks/collect_static.yml

@@ -12,6 +12,7 @@
   - lms-preview
   - lms-xml
   - deploy
+  - jrbl
 
 # Gather lms assets using django if necessary(When rake doesn't know how)
 - name: gather lms static assets with django
@@ -27,6 +28,7 @@
   - lms-preview
   - lms-xml
   - deploy
+  - jrbl
 
 
 # Gather cms assets using rake if possible
@@ -42,6 +44,7 @@
   tags:
   - cms
   - deploy
+  - jrbl
 
 - name: gather cms static assets with django
   shell: SERVICE_VARIANT={{ cms_variant }} django-admin.py collectstatic --pythonpath={{ edx_platform_code_dir }} --settings=lms.envs.aws --noinput --verbosity=0
@@ -54,6 +57,7 @@
   tags:
   - cms
   - deploy
+  - jrbl
 
 - name: update cms templates
   shell: SERVICE_VARIANT={{ cms_variant }} django-admin.py update_templates --pythonpath={{ edx_platform_code_dir }} --settings=cms.envs.aws

playbooks/roles/edxapp/tasks/deploy.yml

@@ -161,6 +161,7 @@
   - lms-xml
   - cms
   - deploy
+  - jrbl
 
 - name: check if django can collect lms static data
   shell: SERVICE_VARIANT={{ lms_variant }} django-admin.py help collectstatic --pythonpath={{ edx_platform_code_dir }} --settings=lms.envs.aws
@@ -174,6 +175,7 @@
   - lms-preview
   - lms-xml
   - deploy
+  - jrbl
 
 - name: check if django can collect cms static data
   shell: SERVICE_VARIANT={{ lms_variant }} django-admin.py help collectstatic --pythonpath={{ edx_platform_code_dir }} --settings=cms.envs.aws
@@ -185,6 +187,7 @@
   tags:
   - cms
   - deploy
+  - jrbl
 
 - name: check if django can update cms templates
   shell: SERVICE_VARIANT={{ cms_variant }} django-admin.py help update_templates --pythonpath={{ edx_platform_code_dir }} --settings=cms.envs.aws
@@ -196,6 +199,7 @@
   tags:
   - cms
   - deploy
+  - jrbl
 
 - include: collect_static.yml
   when: celery_worker is not defined

playbooks/roles/edxapp/vars/main.yml

@@ -91,7 +91,7 @@ generic_env_config:  &edxapp_generic_env
   'WIKI_ENABLED': true
   'SYSLOG_SERVER':  'syslog.a.m.i4x.org'
   'SITE_NAME':  'example.com'
-  'LOG_DIR':  '/mnt/logs/edx'
+  'LOG_DIR':  '/logs/edx'
   'MEDIA_URL':  ''
   'ANALYTICS_SERVER_URL':  ''
   'EEDBACK_SUBMISSION_EMAIL': ''

playbooks/roles/ora/vars/main.yml

@@ -17,7 +17,7 @@ ora_gunicorn_port: 8091
 # services on a single server.
 ora_env_config:
   "LOGGING_ENV": "prod-grader"
-  "LOG_DIR": "/mnt/logs"
+  "LOG_DIR": "/logs"
   "REQUESTS_TIMEOUT": "5"
   "QUEUES_TO_PULL_FROM": "open-ended"
   "TIME_BETWEEN_XQUEUE_PULLS": "5"

playbooks/roles/xqueue/vars/main.yml

@@ -20,7 +20,7 @@ xqueue_env_config:
     'open-ended': !!null
   'XQUEUE_WORKERS_PER_QUEUE': 12
   'LOGGING_ENV' : 'sandbox'
-  'LOG_DIR' : '/mnt/logs'
+  'LOG_DIR' : '/logs'
   'SYSLOG_SERVER' : 'syslog.a.m.i4x.org'
   'RABBIT_HOST' : 'localhost'
   'S3_BUCKET_PREFIX' : 'sandbox-bucket'