From e307bf5dd60dc84587f76d88956499ee1f1013fb Mon Sep 17 00:00:00 2001
From: Rick Harris <rick.harris@rackspace.com>
Date: Thu, 9 Jun 2011 21:36:20 +0000
Subject: Fixing code per review comments

---
 nova/image/glance.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'nova/image')

diff --git a/nova/image/glance.py b/nova/image/glance.py
index f82c0f4a3..5712215bb 100644
--- a/nova/image/glance.py
+++ b/nova/image/glance.py
@@ -45,7 +45,9 @@ def pick_glance_api_server():
 
         Returns (host, port)
     """
-    host, port = random.choice(FLAGS.glance_api_servers)
+    host_port = random.choice(FLAGS.glance_api_servers)
+    host, port_str = host_port.split(':')
+    port = int(port_str)
     return host, port
 
 
@@ -60,7 +62,8 @@ class GlanceImageService(service.BaseImageService):
     SERVICE_IMAGE_ATTRS = service.BaseImageService.BASE_IMAGE_ATTRS +\
                           GLANCE_ONLY_ATTRS
 
-    _client = None
+    def __init__(self, client=None):
+        self._client = client
 
     def _get_client(self):
         # NOTE(sirp): we want to load balance each request across glance
-- 
cgit