X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fopenstack%2Fdriver.py;h=2edf10ea24d0c84156c511758c349ad08ec64755;hb=90ecab134bf44662886576bea76c48d0aea316b7;hp=093ab5a9d59ba41b8576ce110aead4ad6f656052;hpb=ffae8c3132d6a1ae7ad7213eafdc3fa6621fac1d;p=plstackapi.git

diff --git a/planetstack/openstack/driver.py b/planetstack/openstack/driver.py
index 093ab5a..2edf10e 100644
--- a/planetstack/openstack/driver.py
+++ b/planetstack/openstack/driver.py
@@ -1,7 +1,7 @@
 import commands
 import hashlib
 from planetstack.config import Config
-from core.models import Deployment
+from core.models import Controller
 
 try:
     from openstack.client import OpenStackClient
@@ -24,30 +24,31 @@ class OpenStackDriver:
 
         self.enabled = manager_enabled
         self.has_openstack = has_openstack
-        self.deployment = None
+        self.controller = None
         self.admin_user = None
 
-    def client_driver(self, caller=None, tenant=None, deployment=None):
-        admin_driver = self.admin_driver(tenant=tenant, deployment=deployment)
+    def client_driver(self, caller=None, tenant=None, controller=None):
         if caller:
             auth = {'username': caller.email,
                     'password': hashlib.md5(caller.password).hexdigest()[:6],
                     'tenant': tenant}
-            client = OpenStackClient(deployment=admin_driver.deployment, **auth)
+            client = OpenStackClient(controller=controller, cacert=self.config.nova_ca_ssl_cert, **auth)
         else:
-            client = OpenStackClient(tenant=tenant, deployment=admin_driver.deployment)
+            admin_driver = self.admin_driver(tenant=tenant, controller=controller)
+            client = OpenStackClient(tenant=tenant, controller=admin_driver.controller)
 
         driver = OpenStackDriver(client=client)
-        driver.admin_user = admin_driver.admin_user
-        driver.deployment = admin_driver.deployment
+        #driver.admin_user = admin_driver.admin_user
+        #driver.controller = admin_driver.controller
         return driver
 
-    def admin_driver(self, tenant=None, deployment=None):
-        deployment = Deployment.objects.get(name=deployment)
-        client = OpenStackClient(tenant=tenant, deployment=deployment)
+    def admin_driver(self, tenant=None, controller=None):
+        if isinstance(controller, int):
+            controller = Controller.objects.get(id=controller.id)
+        client = OpenStackClient(tenant=tenant, controller=controller, cacert=self.config.nova_ca_ssl_cert)
         driver = OpenStackDriver(client=client)
-        driver.admin_user = client.keystone.users.find(name=deployment.admin_user)
-        driver.deployment = deployment
+        driver.admin_user = client.keystone.users.find(name=controller.admin_user)
+        driver.controller = controller
         return driver    
 
     def create_role(self, name):
@@ -433,12 +434,12 @@ class OpenStackDriver:
         
         # determine availability zone and compute host 
         availability_zone_filter = None
-        if not availability_zone:
+        if availability_zone is None or not availability_zone:
             availability_zone_filter = 'nova'
         else: 
             availability_zone_filter = availability_zone
         if hostname:
-            availability_zone_filter += ':%s' % hostname.split('.')[0]
+            availability_zone_filter += ':%s' % hostname
 
         server = self.shell.nova.servers.create(
                                             name=name,