fix openstack integration
diff --git a/planetstack/openstack/driver.py b/planetstack/openstack/driver.py
index eba424a..f84fbb8 100644
--- a/planetstack/openstack/driver.py
+++ b/planetstack/openstack/driver.py
@@ -2,7 +2,6 @@
from planetstack.config import Config
from openstack.client import OpenStackClient
-has_openstack = False
class OpenStackDriver:
def __init__(self, config = None, client=None):
@@ -12,10 +11,7 @@
self.config = Config()
self.admin_client = OpenStackClient()
- if has_openstack:
- self.admin_user = self.admin_client.keystone.users.find(name=self.admin_client.keystone.username)
- else:
- self.admin_user = None
+ self.admin_user = self.admin_client.keystone.users.find(name=self.admin_client.keystone.username)
if client:
self.shell = client
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 = {}