From 6fe46ad056857e76c27093bdcc03e4a8618faafc Mon Sep 17 00:00:00 2001
From: Donagh McCabe <donagh.mccabe@hp.com>
Date: Thu, 5 Jan 2012 11:07:23 +0000
Subject: [PATCH] Bug #904830: use type==object-store instead of name==swift
 from service catalog

The name field in the service catalog is an operator-specified, marketing name.
The type field contains the canonical name for the service (i.e., swift is
object-store).

Change-Id: I8556b3e6fddd8784f259170195352478d9c6ae32
---
 bin/swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/swift b/bin/swift
index ca7921b358..52b5486ec3 100755
--- a/bin/swift
+++ b/bin/swift
@@ -248,11 +248,11 @@ def _get_auth_v2_0(url, user, key, snet):
         url = None
         catalogs = body['access']['serviceCatalog']
         for service in catalogs:
-            if service['name'] == 'swift':
+            if service['type'] == 'object-store':
                 url = service['endpoints'][0]['publicURL']
         token_id = body['access']['token']['id']
         if not url:
-            raise ClientException("There is no swift endpoint " \
+            raise ClientException("There is no object-store endpoint " \
                                   "on this auth server.")
     except(KeyError, IndexError):
         raise ClientException("Error while getting answers from auth server")