From ecc4fb330dea487b7ac86050eb971d97cea895d6 Mon Sep 17 00:00:00 2001
From: Terry Howe <terrylhowe@gmail.com>
Date: Tue, 21 Jan 2014 10:45:52 -0700
Subject: [PATCH] Glance client no longer isa http client

If the client has-a http_client, then is must not be an is-a.  This has been tested with the current version of glanceclient and the master branch.

Closes-Bug: #1269821
Change-Id: I14d67eb094bfb4c2dbc07106343488298b6a9409
---
 openstackclient/image/client.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openstackclient/image/client.py b/openstackclient/image/client.py
index 9edffded90..ba48a0e967 100644
--- a/openstackclient/image/client.py
+++ b/openstackclient/image/client.py
@@ -73,7 +73,7 @@ class Client_v1(gc_v1_client.Client):
 
     def __init__(self, *args, **kwargs):
         super(Client_v1, self).__init__(*args, **kwargs)
-        self.images = ImageManager_v1(self)
+        self.images = ImageManager_v1(getattr(self, 'http_client', self))
 
 
 class ImageManager_v1(gc_v1_images.ImageManager):