Merge pull request #2147 from edx/master

Update Cypress RC

playbooks/roles/ecommerce/defaults/main.yml

@@ -9,7 +9,7 @@
 #
 ##
 # Defaults for role ecommerce
-# 
+#
 
 ECOMMERCE_GIT_IDENTITY: !!null
 
@@ -42,9 +42,10 @@ ECOMMERCE_EDX_API_KEY: 'put-your-edx-api-auth-token-here'
 ECOMMERCE_ECOMMERCE_URL_ROOT: 'https://www.example.com'
 ECOMMERCE_LMS_URL_ROOT: 'https://www.example.com'
 ECOMMERCE_JWT_SECRET_KEY: 'generated-key-that-matches-ECOMMERCE_API_SIGNING_KEY-in-edxapp'
+ECOMMERCE_JWT_VERIFY_EXPIRATION: true
 
 # Generated by the app that you're using as your auth source
-# in most cases this will be the edx-platform 
+# in most cases this will be the edx-platform
 ECOMMERCE_SOCIAL_AUTH_EDX_OIDC_KEY : 'some-secret'
 ECOMMERCE_SOCIAL_AUTH_EDX_OIDC_SECRET : 'some-secret'
 ECOMMERCE_SOCIAL_AUTH_EDX_OIDC_ID_TOKEN_DECRYPTION_KEY : 'some-secret'
@@ -104,6 +105,8 @@ ECOMMERCE_SERVICE_CONFIG:
   LMS_DASHBOARD_URL: '{{ ECOMMERCE_LMS_URL_ROOT }}/dashboard'
   JWT_AUTH:
     JWT_SECRET_KEY: '{{ ECOMMERCE_JWT_SECRET_KEY }}'
+    JWT_ISSUER: '{{ ECOMMERCE_LMS_URL_ROOT }}/oauth2'
+    JWT_VERIFY_EXPIRATION: '{{ ECOMMERCE_JWT_VERIFY_EXPIRATION }}'
   SOCIAL_AUTH_EDX_OIDC_KEY: '{{ ECOMMERCE_SOCIAL_AUTH_EDX_OIDC_KEY }}'
   SOCIAL_AUTH_EDX_OIDC_SECRET: '{{ ECOMMERCE_SOCIAL_AUTH_EDX_OIDC_SECRET }}'
   SOCIAL_AUTH_EDX_OIDC_ID_TOKEN_DECRYPTION_KEY: '{{ ECOMMERCE_SOCIAL_AUTH_EDX_OIDC_ID_TOKEN_DECRYPTION_KEY }}'
@@ -131,7 +134,7 @@ ECOMMERCE_REPOS:
     DESTINATION: "{{ ecommerce_code_dir }}"
     SSH_KEY: "{{ ECOMMERCE_GIT_IDENTITY }}"
 
-    
+
 ECOMMERCE_GUNICORN_WORKERS: "2"
 ECOMMERCE_GUNICORN_EXTRA: ""
 ECOMMERCE_GUNICORN_EXTRA_CONF: ""

playbooks/roles/edxapp/defaults/main.yml

@@ -229,6 +229,7 @@ EDXAPP_BULK_EMAIL_DEFAULT_FROM_EMAIL: 'no-reply@example.com'
 EDXAPP_BULK_EMAIL_LOG_SENT_EMAILS: false
 EDXAPP_UNIVERSITY_EMAIL: 'university@example.com'
 EDXAPP_PRESS_EMAIL: 'press@example.com'
+EDXAPP_JWT_EXPIRATION: 30  # Number of seconds until expiration
 
 EDXAPP_PLATFORM_TWITTER_ACCOUNT: '@YourPlatformTwitterAccount'
 EDXAPP_PLATFORM_FACEBOOK_ACCOUNT: 'http://www.facebook.com/YourPlatformFacebookAccount'
@@ -717,6 +718,8 @@ generic_env_config:  &edxapp_generic_env
   WIKI_ENABLED: true
   SYSLOG_SERVER:  "{{ EDXAPP_SYSLOG_SERVER }}"
   LOG_DIR:  "{{ COMMON_DATA_DIR }}/logs/edx"
+  JWT_ISSUER: "https://{{ EDXAPP_LMS_BASE }}/oauth2"
+  JWT_EXPIRATION: '{{ EDXAPP_JWT_EXPIRATION }}'
 
   #must end in slash (https://docs.djangoproject.com/en/1.4/ref/settings/#media-url)
   MEDIA_URL:  "{{ EDXAPP_MEDIA_URL }}/"

playbooks/roles/launch_ec2/tasks/main.yml

@@ -74,7 +74,7 @@
     zone: "{{ dns_zone }}"
     type: CNAME
     ttl: 300
-    record: "studio.{{ dns_name }}.{{ dns_zone }}"
+    record: "studio-{{ dns_name }}.{{ dns_zone }}"
     value: "{{ item.public_dns_name }}"
   with_items: ec2.instances
 
@@ -86,7 +86,7 @@
     zone: "{{ dns_zone }}"
     type: CNAME
     ttl: 300
-    record: "preview.{{ dns_name }}.{{ dns_zone }}"
+    record: "preview-{{ dns_name }}.{{ dns_zone }}"
     value: "{{ item.public_dns_name }}"
   with_items: ec2.instances
 

playbooks/roles/minos/defaults/main.yml

@@ -30,8 +30,9 @@ minos_voter_cfg: "{{ COMMON_CFG_DIR }}/{{ minos_service_name }}/conf.d/"
 minos_git_ssh: "/tmp/git.sh"
 minos_git_identity: "{{ minos_app_dir }}/minos-git-identity"
 minos_edx_server_tools_repo: "git@github.com/edx-ops/edx-minos.git"
-minos_edx_server_tools_version: "release"
-minos_requirement: "git+ssh://{{ minos_edx_server_tools_repo }}@{{ minos_edx_server_tools_version }}#egg=edx-minos"
+minos_edx_server_tools_branch: "release"
+minos_edx_server_tools_version: "0.3"
+minos_requirement: "git+ssh://{{ minos_edx_server_tools_repo }}@{{ minos_edx_server_tools_branch }}#egg=edx-minos"
 
 #
 # OS packages

playbooks/roles/minos/tasks/main.yml

@@ -58,8 +58,7 @@
     mode=0755 owner=root group=root
   with_items:
     - "BellwetherVoter"
-    - "ProccessQuienscenceVoterCelery"
-    - "ProccessQuienscenceVoterGunicorn"
+    - "ProccessQuiescenceVoterPython"
     - "TrackingLogVoter"
     - "ZippedTrackingLogVoter"
     - "RolledTrackingLogVoter"
@@ -90,6 +89,7 @@
     virtualenv="{{ minos_app_dir }}/venvs/"
     state=present
     extra_args="--exists-action w"
+    version="{{ minos_edx_server_tools_version }}"
   environment:
     GIT_SSH: "{{ minos_git_ssh }}"
   with_items:

playbooks/roles/minos/templates/edx/etc/minos/conf.d/ProccessQuiescenceVoterPython.yml.j2

@@ -0,0 +1,4 @@
+ProccessQuiescenceVoter:
+  config:
+    process_name: 'python'
+    username: '{{ common_web_user }}'

playbooks/roles/stop_all_edx_services/handlers/main.yml

@@ -42,8 +42,9 @@
 - name: stop mongodb
   service: name=mongodb state=stopped arguments="{{ STOP_ALL_EDX_SERVICES_EXTRA_ARGS }}"
 
+# Celery and Supervisord should not be killed because they may have long running tasks that need to finish
 - name: kill processes by user
-  shell: pkill -u {{ item }} || true
+  shell: pgrep -u {{ item }} -lf | grep -v celery | grep -v supervisord | grep -v gunicorn |  awk '{ print $1}' | xargs -I {} kill {} || true
   with_items:
   - www-data
   - devpi.supervisor

util/jenkins/ansible-provision.sh

@@ -174,9 +174,9 @@ if [[ $edx_internal == "true" ]]; then
     # user and set edx_internal to True so that
     # xserver is installed
     cat << EOF >> $extra_vars_file
-EDXAPP_PREVIEW_LMS_BASE: preview.${deploy_host}
+EDXAPP_PREVIEW_LMS_BASE: preview-${deploy_host}
 EDXAPP_LMS_BASE: ${deploy_host}
-EDXAPP_CMS_BASE: studio.${deploy_host}
+EDXAPP_CMS_BASE: studio-${deploy_host}
 EDXAPP_SITE_NAME: ${deploy_host}
 CERTS_DOWNLOAD_URL: "http://${deploy_host}:18090"
 CERTS_VERIFY_URL: "http://${deploy_host}:18090"

util/jenkins/build-ami.sh

@@ -112,4 +112,4 @@ cd util/vpc-tools/
 
 echo "$vars" > /var/tmp/$BUILD_ID-extra-vars.yml
 cat /var/tmp/$BUILD_ID-extra-vars.yml
-python -u abbey.py -p $play -t c3.large -d $deployment -e $environment -i /edx/var/jenkins/.ssh/id_rsa $base_params $blessed_params $playbookdir_params --vars /var/tmp/$BUILD_ID-extra-vars.yml -c $BUILD_NUMBER --configuration-version $configuration --configuration-secure-version $configuration_secure -k $jenkins_admin_ec2_key --configuration-secure-repo $jenkins_admin_configuration_secure_repo $configurationprivate_params $hipchat_params $cleanup_params $notification_params
+python -u abbey.py -p $play -t m3.large -d $deployment -e $environment -i /edx/var/jenkins/.ssh/id_rsa $base_params $blessed_params $playbookdir_params --vars /var/tmp/$BUILD_ID-extra-vars.yml -c $BUILD_NUMBER --configuration-version $configuration --configuration-secure-version $configuration_secure -k $jenkins_admin_ec2_key --configuration-secure-repo $jenkins_admin_configuration_secure_repo $configurationprivate_params $hipchat_params $cleanup_params $notification_params