From 2ef1ef5a8a3bef55d983733c349e8027469b037e Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Thu, 28 Jun 2012 11:18:35 -0400 Subject: [PATCH] pushing essex changes --- sfa/openstack/nova_shell.py | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/sfa/openstack/nova_shell.py b/sfa/openstack/nova_shell.py index 1d3c0e4c..c597729b 100644 --- a/sfa/openstack/nova_shell.py +++ b/sfa/openstack/nova_shell.py @@ -14,7 +14,7 @@ try: from nova.compute.manager import ComputeManager from nova.network.manager import NetworkManager from nova.scheduler.manager import SchedulerManager - from sfa.openstack.client import GlanceClient + from sfa.openstack.client import GlanceClient, NovaClient has_nova = True except: has_nova = False @@ -49,24 +49,13 @@ class NovaShell: def __init__ ( self, config ) : if not config: config = Config() - self.auth_manager = None - self.compute_manager = None - self.network_manager = None - self.scheduler_manager = None - self.db = None self.image_manager = None + self.nova_manager = None if has_nova: - logger.debug('nova access - native') - # load the config - flags.FLAGS(['foo', '--flagfile=/etc/nova/nova.conf', 'foo', 'foo']) # instantiate managers - self.auth_manager = AuthManager() - self.compute_manager = ComputeManager() - self.network_manager = NetworkManager() - self.scheduler_manager = SchedulerManager() - self.db = InjectContext(db, context.get_admin_context()) self.image_manager = GlanceClient(config) + self.nova_manager = NovaClient(config) else: logger.debug('nova access - REST') raise SfaNotImplemented('nova access - Rest') -- 2.43.0