X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fopenstack_observer%2Fsteps%2Fsync_user_deployments.py;h=54f6130c31e8b6e236fb5a786df0b8f06658898c;hb=265385ea1a43e2cfb544a2431dd0162ece2c8abc;hp=69faa9f76c6b1a1ce8f5fe820c9d0932780b11cf;hpb=c4ac742b5bd4cd09fa8d0bb993e0a315cd0e4449;p=plstackapi.git diff --git a/planetstack/openstack_observer/steps/sync_user_deployments.py b/planetstack/openstack_observer/steps/sync_user_deployments.py index 69faa9f..54f6130 100644 --- a/planetstack/openstack_observer/steps/sync_user_deployments.py +++ b/planetstack/openstack_observer/steps/sync_user_deployments.py @@ -5,7 +5,7 @@ from collections import defaultdict from django.db.models import F, Q from planetstack.config import Config from observer.openstacksyncstep import OpenStackSyncStep -from core.models.site import SiteDeployment, Deployment +from core.models.site import SiteDeployments, Deployment from core.models.user import User from core.models.userdeployments import UserDeployment from util.logger import Logger, logging @@ -39,7 +39,7 @@ class SyncUserDeployment(OpenStackSyncStep): roles = [] # setup user deployment home site roles if user_deployment.user.site: - site_deployments = SiteDeployment.objects.filter(site=user_deployment.user.site, + site_deployments = SiteDeployments.objects.filter(site=user_deployment.user.site, deployment=user_deployment.deployment) if site_deployments: # need the correct tenant id for site at the deployment @@ -50,7 +50,7 @@ class SyncUserDeployment(OpenStackSyncStep): if user_deployment.user.is_admin: roles.append('admin') else: - raise Exception('Internal error. Missing SiteDeployment for user %s'%user_deployment.user.email) + raise Exception('Internal error. Missing SiteDeployments for user %s'%user_deployment.user.email) else: raise Exception('Siteless user %s'%user_deployment.user.email)