further mitx removal

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(4|11|21|10|20)_prod
-#- hosts: ~tag_Name_app(10|20)_prod
-#- hosts: ~tag_Name_app(11|21)_prod
+#- hosts: ~tag_Name_app1_prod
+- hosts: ~tag_Name_app2_prod
 ## this is the test box
 #- hosts: ~tag_Name_app4_prod
-- hosts: ~tag_Name_app(4|1|2)_prod
+#- hosts: ~tag_Name_app(4|1|2)_prod
 ## you can also do security group, but don't do that
 #- hosts: security_group_edx-prod-EdxappServerSecurityGroup-NSKCQTMZIPQB
   sudo: True
@@ -40,8 +39,9 @@
       nginx_sites:
       - lms
       - cms
-      - lms-preview
+      - verify
       nginx_template_directory: "{{local_dir}}/nginx/templates/"
+      tags: nginx
     - edxapp
     - apache
     - shibboleth

playbooks/roles/edxapp/defaults/main.yml

@@ -59,7 +59,7 @@ EDXAPP_CELERY_PASSWORD: 'celery'
 
 EDXAPP_PLATFORM_NAME: 'edX'
 
-EDXAPP_MITX_FEATURES:
+EDXAPP_FEATURES:
   AUTH_USE_OPENID_PROVIDER: true
   CERTIFICATES_ENABLED: true
   ENABLE_DISCUSSION_SERVICE: true
@@ -242,7 +242,7 @@ edxapp_generic_auth_config:  &edxapp_generic_auth
         host: $EDXAPP_MONGO_HOSTS
         password:  $EDXAPP_MONGO_PASSWORD
         port: $EDXAPP_MONGO_PORT
-        render_template:  'mitxmako.shortcuts.render_to_string'
+        render_template:  'edxmako.shortcuts.render_to_string'
         # Needed for the CMS to be able to run update_templates
         user: $EDXAPP_MONGO_USER
       DOC_STORE_CONFIG: *edxapp_generic_default_docstore
@@ -282,7 +282,7 @@ generic_env_config:  &edxapp_generic_env
   LOCAL_LOGLEVEL: $EDXAPP_LOG_LEVEL
   # default email backed set to local SMTP
   EMAIL_BACKEND: $EDXAPP_EMAIL_BACKEND
-  MITX_FEATURES: $EDXAPP_MITX_FEATURES
+  FEATURES: $EDXAPP_FEATURES
   WIKI_ENABLED: true
   SYSLOG_SERVER:  $EDXAPP_SYSLOG_SERVER
   SITE_NAME:  $EDXAPP_SITE_NAME
@@ -350,7 +350,7 @@ lms_auth_config:
               host: $EDXAPP_MONGO_HOSTS
               db: $EDXAPP_MONGO_DB_NAME
               collection: 'modulestore'
-              render_template: 'mitxmako.shortcuts.render_to_string'
+              render_template: 'edxmako.shortcuts.render_to_string'
               user: $EDXAPP_MONGO_USER
               password: $EDXAPP_MONGO_PASSWORD
               port: $EDXAPP_MONGO_PORT

playbooks/roles/edxapp/tasks/deploy.yml

@@ -187,9 +187,8 @@
   - "{{ sandbox_base_requirements }}"
   - "{{ sandbox_local_requirements }}"
   - "{{ sandbox_post_requirements }}"
-  when: not EDXAPP_PYTHON_SANDBOX
   sudo_user: "{{ edxapp_user }}"
-  when: not inst.stat.exists or new.stat.md5 != inst.stat.md5
+  when: "not EDXAPP_PYTHON_SANDBOX and (not inst.stat.exists or new.stat.md5 != inst.stat.md5)"
   notify:
   - "edxapp | restart edxapp"
   - "edxapp | restart edxapp_workers"