summaryrefslogtreecommitdiffstats
path: root/nova/compute
diff options
context:
space:
mode:
authorNaveed Massjouni <naveedm9@gmail.com>2011-05-18 03:51:25 -0400
committerNaveed Massjouni <naveedm9@gmail.com>2011-05-18 03:51:25 -0400
commit6c151bfbfeb728d6e38f777640d483c1e344113d (patch)
tree4cc80cb1a76abf2c26f729c57e60c82029540c96 /nova/compute
parentd24f59a251173826817e5f5c53a4f54dfe927f2d (diff)
Removed all utils.import_object(FLAGS.image_service) and replaced with
utils.get_default_image_service().
Diffstat (limited to 'nova/compute')
-rw-r--r--nova/compute/api.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py
index 930e4efaa..4e7af7421 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -58,9 +58,7 @@ class API(base.Base):
def __init__(self, image_service=None, network_api=None,
volume_api=None, hostname_factory=generate_default_hostname,
**kwargs):
- if not image_service:
- image_service = utils.import_object(FLAGS.image_service)
- self.image_service = image_service
+ self.image_service = image_service or utils.get_default_image_service()
if not network_api:
network_api = network.API()
self.network_api = network_api