diff --git a/conf/quads.yml b/conf/quads.yml index 872710274..d12e0a84c 100644 --- a/conf/quads.yml +++ b/conf/quads.yml @@ -231,4 +231,15 @@ default_wipe: True models: R620,R630,R640,R930,R730XD,FC640,6018R,6048R,1029U-TRTP,1029U-TN10RT,1029P,5039MS,6049P # Amount of hours for locking a cloud for redefinition -cloud_reservation_lock: 48 \ No newline at end of file +cloud_reservation_lock: 48 + +# Continue to send notifications for expiration until assignments are +# actually extended. We set this because our ticket system (JIRA) is not tied +# into QUADS to silence expiration notices if an expiration request is +# submitted, only when it's executed will notifications cease. +# Unless you have done custom modification of notify.py/QUADS to tie toggling +# MongoDB flags for 'message' you want to leave this alone. +# Leaving the below to True will include a message in expiration notifications +# that users can ignore future expiration warnings if they have already +# submitted an extension request but it hasn't been executed yet. +quads_notify_until_extended: True diff --git a/quads/templates/message b/quads/templates/message index ecf0cb769..4586fde9b 100644 --- a/quads/templates/message +++ b/quads/templates/message @@ -31,6 +31,13 @@ of your expiration date. {% endif %} +{% if quads_notify_until_extended %} +If you have already submitted an extension you can disregard +this message, our system will continue to send out expiration +notices until the actual extension is executed. + +{% endif %} + Docs: {{ wp_wiki }}/faq/ diff --git a/quads/tools/notify.py b/quads/tools/notify.py index ee97d39b1..c75cb5867 100755 --- a/quads/tools/notify.py +++ b/quads/tools/notify.py @@ -92,6 +92,7 @@ def create_message( wp_wiki=conf["wp_wiki"], quads_request_url=quads_request_url, quads_request_deadline_day=conf["quads_request_deadline_day"], + quads_notify_until_extended=conf["quads_notify_until_extended"], cloud=cloud, hosts=host_list_expire, )