diff options
| author | chenhaiq <chenhaiq@cn.ibm.com> | 2013-11-13 17:11:02 +0800 |
|---|---|---|
| committer | Steve Baker <sbaker@redhat.com> | 2013-12-05 11:08:13 +1300 |
| commit | 6f3e0842e40c636ee6e99657fbf8f6162289d8b5 (patch) | |
| tree | b6704ac5f8075fce4390c88f8baa780be3c53a30 /heatclient/shell.py | |
| parent | fa084b50fa3240b418065f7939ea216780fc1dbc (diff) | |
| download | python-heatclient-6f3e0842e40c636ee6e99657fbf8f6162289d8b5.tar.gz | |
Add --include-pass option for grizzly backwards compat
Set X-Auth-User, X-Auth-Key on all stack commands to allow the
latest python-heatclient to work on grizzly heat.
Partial-Bug:1250731
Change-Id: I29d4785cf3520e809252b5aeab25cf471a88cde8
Diffstat (limited to 'heatclient/shell.py')
| -rw-r--r-- | heatclient/shell.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/heatclient/shell.py b/heatclient/shell.py index 434fc9e..d04a9d1 100644 --- a/heatclient/shell.py +++ b/heatclient/shell.py @@ -176,6 +176,11 @@ class HeatShell(object): parser.add_argument('--os_endpoint_type', help=argparse.SUPPRESS) + parser.add_argument('--include-password', + default=bool(utils.env('HEAT_INCLUDE_PASSWORD')), + action='store_true', + help='Send os-username and os-password to heat') + return parser def get_subcommand_parser(self, version): @@ -328,7 +333,8 @@ class HeatShell(object): 'auth_url': args.os_auth_url, 'service_type': args.os_service_type, 'endpoint_type': args.os_endpoint_type, - 'insecure': args.insecure + 'insecure': args.insecure, + 'include_pass': args.include_password } endpoint = args.heat_url @@ -346,7 +352,8 @@ class HeatShell(object): 'key_file': args.key_file, 'username': args.os_username, 'password': args.os_password, - 'endpoint_type': args.os_endpoint_type + 'endpoint_type': args.os_endpoint_type, + 'include_pass': args.include_password } if args.os_region_name: |