From bb7c630504cb3ab9f513be9b9feddbc791f5c4f2 Mon Sep 17 00:00:00 2001
From: Cyril Roelandt <cyril@redhat.com>
Date: Wed, 23 Feb 2022 20:47:23 +0100
Subject: [PATCH] Improve help messages for a few options

Closes-Bug: #1962037
Change-Id: If082a7f4cc09ffc42c68081dd43c2808b6c5f8a9
---
 keystoneauth1/loading/identity.py | 9 ++++++---
 keystoneauth1/loading/session.py  | 8 ++++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/keystoneauth1/loading/identity.py b/keystoneauth1/loading/identity.py
index 860cffe2..446c7667 100644
--- a/keystoneauth1/loading/identity.py
+++ b/keystoneauth1/loading/identity.py
@@ -56,7 +56,8 @@ class BaseV2Loader(BaseIdentityLoader):
         options.extend([
             opts.Opt('tenant-id', help='Tenant ID'),
             opts.Opt('tenant-name', help='Tenant Name'),
-            opts.Opt('trust-id', help='Trust ID'),
+            opts.Opt('trust-id',
+                     help='ID of the trust to use as a trustee use'),
         ])
 
         return options
@@ -83,7 +84,8 @@ class BaseV3Loader(BaseIdentityLoader):
                      help='Domain ID containing project'),
             opts.Opt('project-domain-name',
                      help='Domain name containing project'),
-            opts.Opt('trust-id', help='Trust ID'),
+            opts.Opt('trust-id',
+                     help='ID of the trust to use as a trustee use'),
         ])
 
         return options
@@ -148,7 +150,8 @@ class BaseGenericLoader(BaseIdentityLoader):
                      help='Domain ID containing project'),
             opts.Opt('project-domain-name',
                      help='Domain name containing project'),
-            opts.Opt('trust-id', help='Trust ID'),
+            opts.Opt('trust-id',
+                     help='ID of the trust to use as a trustee use'),
             opts.Opt('default-domain-id',
                      help='Optional domain ID to use with v3 and v2 '
                           'parameters. It will be used for both the user '
diff --git a/keystoneauth1/loading/session.py b/keystoneauth1/loading/session.py
index ba7e299a..25a7b136 100644
--- a/keystoneauth1/loading/session.py
+++ b/keystoneauth1/loading/session.py
@@ -103,13 +103,17 @@ class Session(base.BaseLoader):
             '--os-cert',
             metavar='<certificate>',
             default=os.environ.get('OS_CERT'),
-            help='Defaults to env[OS_CERT].')
+            help='The location for the keystore (PEM formatted) '
+                 'containing the public key of this client. '
+                 'Defaults to env[OS_CERT].')
 
         session_group.add_argument(
             '--os-key',
             metavar='<key>',
             default=os.environ.get('OS_KEY'),
-            help='Defaults to env[OS_KEY].')
+            help='The location for the keystore (PEM formatted) '
+                 'containing the private key of this client. '
+                 'Defaults to env[OS_KEY].')
 
         session_group.add_argument(
             '--timeout',