From e41789c4de73476966350370bc83f1cd6d3bc740 Mon Sep 17 00:00:00 2001 From: houweichao Date: Mon, 12 Dec 2016 15:52:03 +0800 Subject: [PATCH] Read project_id and project_name in env We usually use project_id/project_name instead of tenant_id/tenant_name in user's credentials. So mistralclient should read both of them. Change-Id: Id42415c5b82f772e168b16e0143375f5b5b3a0a3 --- mistralclient/shell.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/mistralclient/shell.py b/mistralclient/shell.py index 54f44db..2d9bb64 100644 --- a/mistralclient/shell.py +++ b/mistralclient/shell.py @@ -263,16 +263,19 @@ class MistralShell(app.App): '--os-tenant-id', action='store', dest='tenant_id', - default=env('OS_TENANT_ID'), - help='Authentication tenant identifier (Env: OS_TENANT_ID)' + default=env('OS_TENANT_ID', 'OS_PROJECT_ID'), + help='Authentication tenant identifier (Env: OS_TENANT_ID' + ' or OS_PROJECT_ID)' ) parser.add_argument( '--os-tenant-name', action='store', dest='tenant_name', - default=env('OS_TENANT_NAME', 'Default'), - help='Authentication tenant name (Env: OS_TENANT_NAME)' + default=env('OS_TENANT_NAME', 'OS_PROJECT_NAME', + default='Default'), + help='Authentication tenant name (Env: OS_TENANT_NAME' + ' or OS_PROJECT_NAME)' ) parser.add_argument(