From: KIYOHIRO ADACHI <adachi@mxs.nes.nec.co.jp>
Date: Wed, 18 Sep 2013 06:59:28 +0000 (+0900)
Subject: Fixes call GlanceConnectionFailed in invalid ARG
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=3cc149a802346bef063bcb865182e4e21ec8b086;p=openstack-build%2Fcinder-build.git

Fixes call GlanceConnectionFailed in invalid ARG

A mapping key of 'netloc' is always ignored. Thus information in
'netloc' is lost. But because it is included in 'error_msg', I remove
'netloc=netloc'.

Change-Id: I937044bcca0cb196fcd96cfa421de777713d76f5
Closes-Bug: #1226959
---

diff --git a/cinder/image/glance.py b/cinder/image/glance.py
index 596fffcef..27aeb12d4 100644
--- a/cinder/image/glance.py
+++ b/cinder/image/glance.py
@@ -175,8 +175,7 @@ class GlanceClientWrapper(object):
                                                    'extra': extra,
                                                    }
                     LOG.exception(error_msg)
-                    raise exception.GlanceConnectionFailed(netloc=netloc,
-                                                           reason=str(e))
+                    raise exception.GlanceConnectionFailed(reason=str(e))
                 LOG.exception(error_msg)
                 time.sleep(1)