From 1f2227807fb0cad314b00a9dd9a27e5dc21846f6 Mon Sep 17 00:00:00 2001
From: Steve Baker <sbaker@redhat.com>
Date: Wed, 27 Mar 2013 16:12:55 +1300
Subject: [PATCH] Always pass username, even for --token-only

Change-Id: I3cf164a2d6573fe1f8d3e610c859bfa5ad19aaed
Fixes: bug #1160648
---
 heatclient/shell.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/heatclient/shell.py b/heatclient/shell.py
index 36e967df..3e6c72e0 100644
--- a/heatclient/shell.py
+++ b/heatclient/shell.py
@@ -301,13 +301,13 @@ class HeatShell(object):
                 'ca_file': args.ca_file,
                 'cert_file': args.cert_file,
                 'key_file': args.key_file,
+                'username': args.os_username
             }
 
             if not endpoint:
                 endpoint = self._get_endpoint(_ksclient, **kwargs)
 
         if not args.token_only:
-            kwargs['username'] = args.os_username
             kwargs['password'] = args.os_password
 
         client = heatclient.Client(api_version, endpoint, **kwargs)