diff options
| -rw-r--r-- | src/dashboard/tasks.py | 1 | ||||
| -rw-r--r-- | src/laas_dashboard/settings.py | 4 | ||||
| -rw-r--r-- | src/resource_inventory/resource_manager.py | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/dashboard/tasks.py b/src/dashboard/tasks.py index fec8384..3f88449 100644 --- a/src/dashboard/tasks.py +++ b/src/dashboard/tasks.py @@ -83,6 +83,7 @@ def free_hosts(): job__complete=True, resource__isnull=False ) + for booking in bookings: ResourceManager.getInstance().releaseResourceBundle(booking.resource) diff --git a/src/laas_dashboard/settings.py b/src/laas_dashboard/settings.py index 8f43a3d..6b3ed09 100644 --- a/src/laas_dashboard/settings.py +++ b/src/laas_dashboard/settings.py @@ -240,6 +240,10 @@ CELERYBEAT_SCHEDULE = { 'query_vpn_users': { 'task': 'dashboard.tasks.query_vpn_users', 'schedule': timedelta(hours=1) + }, + 'dispatch_emails': { + 'task': 'notifier.tasks.dispatch_emails', + 'schedule': timedelta(minutes=10) } } diff --git a/src/resource_inventory/resource_manager.py b/src/resource_inventory/resource_manager.py index f587a82..9406977 100644 --- a/src/resource_inventory/resource_manager.py +++ b/src/resource_inventory/resource_manager.py @@ -67,8 +67,7 @@ class ResourceManager: raise NotImplementedError("Resource Bundle Deletion Not Implemented") def releaseResourceBundle(self, resourceBundle): - for resource in resourceBundle.get_resources(): - resource.release() + resourceBundle.release() def get_vlans(self, resourceTemplate): networks = {} |