commit 3375088f267ab5f527f64e62787e13de890f9303
author Tony Mack <tmack@tux.cs.princeton.edu> Tue Jan 06 18:27:48 2015 -0500
committer Tony Mack <tmack@tux.cs.princeton.edu> Tue Jan 06 18:28:03 2015 -0500
tree ca53548192e8a979f14f5675bc41037a30755c07
parent 4511248c0836080a8db910a07be7df4b4b16ad1b

bug fixes

planetstack/openstack/driver.py

diff --git a/planetstack/openstack/driver.py b/planetstack/openstack/driver.py
index f448e40..53b8e3f 100644
--- a/planetstack/openstack/driver.py
+++ b/planetstack/openstack/driver.py
@@ -43,7 +43,8 @@
         return driver
 
     def admin_driver(self, tenant=None, controller=None):
-        controller = Controller.objects.get(id=controller.id)
+        if isinstance(controller, int):
+            controller = Controller.objects.get(id=controller.id)
         client = OpenStackClient(tenant=tenant, controller=controller)
         driver = OpenStackDriver(client=client)
         driver.admin_user = client.keystone.users.find(name=controller.admin_user)