upstream/openstack/python-osc-lib/centos/patches/0001-CGTS-7947-add-os-keyst...

46 lines
1.6 KiB
Diff

From 83a5e9b3fc561d9e9c01c71e122ef6407f99a03a Mon Sep 17 00:00:00 2001
From: Andy Ning <andy.ning@windriver.com>
Date: Tue, 28 Nov 2017 09:28:38 -0500
Subject: [PATCH 1/1] CGTS-7947: add --os-keystone-region-name option to
openstack
The new option only apply to identity client.
---
osc_lib/clientmanager.py | 1 +
osc_lib/shell.py | 7 +++++++
2 files changed, 8 insertions(+)
diff --git a/osc_lib/clientmanager.py b/osc_lib/clientmanager.py
index 6017115..ed4f521 100644
--- a/osc_lib/clientmanager.py
+++ b/osc_lib/clientmanager.py
@@ -91,6 +91,7 @@ class ClientManager(object):
self._app_name = app_name
self._app_version = app_version
self.region_name = self._cli_options.region_name
+ self.keystone_region_name = self._cli_options.keystone_region_name
self.interface = self._cli_options.interface
self.timing = self._cli_options.timing
diff --git a/osc_lib/shell.py b/osc_lib/shell.py
index 6e645a9..afc5da6 100644
--- a/osc_lib/shell.py
+++ b/osc_lib/shell.py
@@ -201,6 +201,13 @@ class OpenStackShell(app.App):
help=_('Authentication region name (Env: OS_REGION_NAME)'),
)
parser.add_argument(
+ '--os-keystone-region-name',
+ metavar='<keystone-region-name>',
+ dest='keystone_region_name',
+ default=utils.env('OS_KEYSTONE_REGION_NAME'),
+ help=_('Keystone Authentication region name (Env: OS_KEYSTONE_REGION_NAME)'),
+ )
+ parser.add_argument(
'--os-cacert',
metavar='<ca-bundle-file>',
dest='cacert',
--
1.8.3.1