Bring in latest from v33

CHANGELOG.md

@@ -25,6 +25,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 -->
 
 ## [Unreleased](https://github.com/cyverse/atmosphere/compare/v33-0...HEAD) - YYYY-MM-DD
+### Added
+  - Add ability to configure allocation overrides
+    ([#652](https://github.com/cyverse/atmosphere/pull/652))
+
 ### Changed
   - Updated Ansible version to 2.6.1 by changing requirements and changing
     `deploy.py` Playbook arg `--inventory-file` to `--inventory`
@@ -33,6 +37,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 ### Fixed
   - Consecutive test runs would fail because django-memoize was intercepting
     cassette playback ([#626](https://github.com/cyverse/atmosphere/pull/626))
+  - Increased hard timeouts for tasks
+    ([#650](https://github.com/cyverse/atmosphere/pull/650))
+  - Variable changes to DJANGO_DEBUG and SEND_EMAILS
+    ([#649](https://github.com/cyverse/atmosphere/pull/649))
 
 ## [v33-0](https://github.com/cyverse/atmosphere/compare/v32-2...v33-0) - 2018-08-06
 ### Changed

atmosphere/settings/local.py.j2

@@ -19,9 +19,17 @@ SECRETS_MODULE = secrets
 
 globals().update(vars(sys.modules['atmosphere.settings']))
 
-# Debug Mode
-DEBUG = {{ DJANGO_DEBUG | default(True) }}
-SEND_EMAILS = {{ not DJANGO_DEBUG | default(False) }}
+{% if DEBUG %}
+DEBUG = True
+{% else %}
+DEBUG = False
+{% endif %}
+
+{% if SEND_EMAILS %}
+SEND_EMAILS = True
+{% else %}
+SEND_EMAILS = False
+{% endif %}
 
 {% if DJANGO_TEMPLATE_DEBUG -%}
 template_backends = filter(lambda t:
@@ -168,14 +176,13 @@ JETSTREAM_CELERYBEAT_SCHEDULE = {
     },
     "update_snapshot": {
         "task": "update_snapshot",
-        "schedule": timedelta(minutes=30),
-        "options": {"expires": 20 * 60, "time_limit": 20 * 60}
+        "schedule": timedelta(minutes=60),
+        "options": {"expires": 40 * 60, "time_limit": 40 * 60}
     },
     "monitor_jetstream_allocation_sources": {
         "task": "monitor_jetstream_allocation_sources",
-        # Every 60 minutes, no longer than 45 minutes
-        "schedule": crontab(minute="*/60"),
-        "options": {"expires": 45 * 60, "time_limit": 45 * 60}
+        "schedule": timedelta(minutes=75),
+        "options": {"expires": 60 * 60, "time_limit": 60 * 60}
     },
     "monitor_allocation_sources": {
         "task": "monitor_allocation_sources",
@@ -500,6 +507,18 @@ TACC_API_PASS = ''
 TACC_API_URL = ''
 {% endif %}
 
+{% if ALLOCATION_OVERRIDES_NEVER_ENFORCE %}
+ALLOCATION_OVERRIDES_NEVER_ENFORCE = {{ ALLOCATION_OVERRIDES_NEVER_ENFORCE }}
+{% else %}
+ALLOCATION_OVERRIDES_NEVER_ENFORCE = []
+{% endif %}
+
+{% if ALLOCATION_OVERRIDES_ALWAYS_ENFORCE %}
+ALLOCATION_OVERRIDES_ALWAYS_ENFORCE = {{ ALLOCATION_OVERRIDES_ALWAYS_ENFORCE }}
+{% else %}
+ALLOCATION_OVERRIDES_ALWAYS_ENFORCE = []
+{% endif %}
+
 ######
 # Atmosphere Plugin Settings
 ######

variables.ini.dist

@@ -43,10 +43,11 @@ DATABASE_PASSWORD = atmosphere_db_pass # psql_password
 DATABASE_HOST = localhost # remote.postgres-server.com
 DATABASE_PORT = 5432
 DATABASE_CONN_MAX_AGE = 60 # in seconds
-DJANGO_DEBUG =  True # Boolean required
+DEBUG =  True # Boolean required
 DJANGO_DEBUG_TOOLBAR =  False # Boolean required
 ENFORCING =  False # Boolean required #NOTE: DO NOT SET TO TRUE UNLESS YOU ARE PRODUCTION!
 SSLSERVER =  False # Boolean required
+SEND_EMAILS = False # Boolean required
 ENABLE_PROJECT_SHARING =  True # Boolean required
 ENABLE_IMAGE_VALIDATION =  True # Boolean required
 DJANGO_TEMPLATE_DEBUG =  True # Boolean required
@@ -91,6 +92,8 @@ EXPIRATION_PLUGINS = ["atmosphere.plugins.auth.validation.NeverExpire"] # list o
 VALIDATION_PLUGINS = ["atmosphere.plugins.auth.validation.AlwaysAllow"] # list of plugins
 ACCOUNT_CREATION_PLUGINS = ["atmosphere.plugins.accounts.creation.UserGroup"] # list of plugins
 MACHINE_VALIDATION_PLUGIN = "atmosphere.plugins.machine_validation.BasicValidation" # plugin
+ALLOCATION_OVERRIDES_NEVER_ENFORCE = []
+ALLOCATION_OVERRIDES_ALWAYS_ENFORCE = []
 
 BLACKLIST_METADATA_KEY = # default: 'atmo_image_exclude'
 WHITELIST_METADATA_KEY = # default: 'atmo_image_include'