Merge "Always pass username, even for --token-only"

2013-04-01 19:35:37 +00:00
parent f3a7dde3c1 1f2227807f
commit 8eaba00143
1 changed files with 1 additions and 1 deletions
--- 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)