commit 89f70f188504958d9ec66757cacace9575a92a52
author Tony Mack <tmack@paris.CS.Princeton.EDU> Fri May 10 20:20:03 2013 -0400
committer Tony Mack <tmack@paris.CS.Princeton.EDU> Fri May 10 20:21:33 2013 -0400
tree dd810c3c54cc777d7418c50c6bc39a22182f777a
parent e2b99da6c3c30b703d9f639205b71af19aabb4ba

fix openstack integration

planetstack/openstack/manager.py

diff --git a/planetstack/openstack/manager.py b/planetstack/openstack/manager.py
index 788699b..857e225 100644
--- a/planetstack/openstack/manager.py
+++ b/planetstack/openstack/manager.py
@@ -1,3 +1,6 @@
+import os
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "planetstack.settings")
+
 from netaddr import IPAddress, IPNetwork
 from planetstack import settings
 from django.core import management
@@ -10,8 +13,7 @@
 except:
     has_openstack = False
 
-#manager_enabled = Config().api_nova_enabled
-manager_enabled = False
+manager_enabled = Config().api_nova_enabled
 
 def require_enabled(callable):
     def wrapper(*args, **kwds):
@@ -277,6 +279,7 @@
         Node.objects.filter(name__in=old_node_names).delete()
 
     def refresh_images(self):
+        from core.models.image import Image
         # collect local images
         images = Image.objects.all()
         images_dict = {}