Merge "Handle IPv6 specifid glance servers gracefully"

diff --cc cinder/tests/image/test_glance.py
index 116096f8e9975a29b9b5a12322e6a4995b502e26,2a80e2dfe5a4ad145a44931d6ea9bc0f83258357..745f8b654a087cff85b2a3467bcf818c7677c7a4
--- 1/cinder/tests/image/test_glance.py
--- 2/cinder/tests/image/test_glance.py
+++ b/cinder/tests/image/test_glance.py
@@@ -551,17 -555,10 +555,17 @@@ class TestGlanceClientVersion(test.Test
              return
  
          self.stubs.Set(glanceclient_v2, '_get_image_model',
 -                       fake_get_image_model)
 +                       fake_get_model)
 +
 +        try:
 +            self.stubs.Set(glanceclient_v2, '_get_member_model',
 +                           fake_get_model)
 +        except AttributeError:
 +            # method requires stubbing only with newer glanceclients.
 +            pass
  
      def test_glance_version_by_flag(self):
-         """Test glance version set by flag is honoured"""
+         """Test glance version set by flag is honoured."""
          client_wrapper_v1 = glance.GlanceClientWrapper('fake', 'fake_host',
                                                         9292)
          self.assertEquals(client_wrapper_v1.client.__module__,