From fda8000631f03e43546ae54e08aeffa594f2ba1e Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Tue, 6 Jan 2015 18:27:48 -0500 Subject: [PATCH] bug fixes --- planetstack/openstack/driver.py | 3 ++- .../steps/sync_controller_slices.py | 16 +++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) 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 @@ class OpenStackDriver: 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) diff --git a/planetstack/openstack_observer/steps/sync_controller_slices.py b/planetstack/openstack_observer/steps/sync_controller_slices.py index 4487f3a..7331fac 100644 --- a/planetstack/openstack_observer/steps/sync_controller_slices.py +++ b/planetstack/openstack_observer/steps/sync_controller_slices.py @@ -7,8 +7,9 @@ from planetstack.config import Config from observer.openstacksyncstep import OpenStackSyncStep from core.models.slice import Slice, ControllerSlice from core.models.controlleruser import ControllerUser -from util.logger import Logger, logging +from util.logger import Logger, logging, logger from observer.ansible import * +from openstack.driver import OpenStackDriver logger = Logger(level=logging.INFO) @@ -35,7 +36,7 @@ class SyncControllerSlices(OpenStackSyncStep): raise Exception("slice createor %s has not accout at controller %s" % (controller_slice.slice.creator, controller_slice.controller.name)) else: controller_user = controller_users[0] - roles = ['admin'] + roles = ['Admin'] max_instances=int(controller_slice.slice.max_slivers) tenant_fields = {'endpoint':controller_slice.controller.auth_url, @@ -57,19 +58,16 @@ class SyncControllerSlices(OpenStackSyncStep): tenant_id = res[0]['id'] if (not controller_slice.tenant_id): try: - driver = OpenStackDriver().client_driver(caller=controller_slice.controller.admin_user, - tenant=controller_slice.controller.admin_tenant, - controller=controller_network.controller) - driver.shell.nova.quotas.update(tenant_id=controller_slice.slice.name, instances=int(controller_slice.slice.max_slivers)) + driver = OpenStackDriver().admin_driver(controller=controller_slice.controller) + driver.shell.nova.quotas.update(tenant_id=controller_slice.tenant_id, instances=int(controller_slice.slice.max_slivers)) except: - logging.info('Could not update quota for %s'%controller_slice.slice.name) + logger.log_exc('Could not update quota for %s'%controller_slice.slice.name) raise Exception('Could not update quota for %s'%controller_slice.slice.name) - + controller_slice.tenant_id = tenant_id controller_slice.save() - def delete_record(self, controller_slice): user = User.objects.get(id=controller_slice.slice.creator.id) driver = OpenStackDriver().admin_driver(controller=controller_slice.controller.name) -- 2.43.0