commit e10fbe5a95a2bd6c8cb9f9c04f082eb8b25acd91
author Tony Mack <tmack@tux.cs.princeton.edu> Sat Jan 03 19:37:39 2015 -0500
committer Tony Mack <tmack@tux.cs.princeton.edu> Sat Jan 03 19:37:53 2015 -0500
tree ac06c6681d0211ea933326d8321c11c65ece7899
parent ed8a4a0455110f8bf08160fbf1b5ad0a70160547

Fix bugs. Reefactor.

planetstack/openstack_observer/steps/sync_controller_users.py

diff --git a/planetstack/openstack_observer/steps/sync_controller_users.py b/planetstack/openstack_observer/steps/sync_controller_users.py
index 113869e..1b57b81 100644
--- a/planetstack/openstack_observer/steps/sync_controller_users.py
+++ b/planetstack/openstack_observer/steps/sync_controller_users.py
@@ -4,7 +4,7 @@
 from django.db.models import F, Q
 from planetstack.config import Config
 from observer.openstacksyncstep import OpenStackSyncStep
-from core.models.site import Controller, SiteDeployments, ControllerSiteDeployments
+from core.models.site import Controller, SiteDeployments, SiteDeployments
 from core.models.user import User
 from core.models.controllerusers import ControllerUsers
 from util.logger import Logger, logging
@@ -44,7 +44,7 @@
             raise Exception('Siteless user %s'%controller_user.user.email)
         else:
             # look up tenant id for the user's site at the controller
-            #ctrl_site_deployments = ControllerSiteDeployments.objects.filter(
+            #ctrl_site_deployments = SiteDeployments.objects.filter(
             #  site_deployment__site=controller_user.user.site,
             #  controller=controller_user.controller)