From e495c33d79c2da499ed9e2b536e84a4367c75246 Mon Sep 17 00:00:00 2001
From: Eric Fried <efried@us.ibm.com>
Date: Tue, 5 Sep 2017 10:34:31 -0500
Subject: [PATCH] Recommend unversioned for endpoint-override

Update the help string for Adapter's endpoint-override conf option to
recommend specifying the unversioned endpoint.  This is so that ksa can
do the appropriate endpoint discovery itself.

Change-Id: I6178a7c0b80e22cc48f049efc24d1c74f26d4b2d
---
 keystoneauth1/loading/adapter.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/keystoneauth1/loading/adapter.py b/keystoneauth1/loading/adapter.py
index c25f0901..01baa7aa 100644
--- a/keystoneauth1/loading/adapter.py
+++ b/keystoneauth1/loading/adapter.py
@@ -110,7 +110,11 @@ class Adapter(base.BaseLoader):
                            deprecated_opts=deprecated_opts.get(
                                'endpoint-override'),
                            help='Always use this endpoint URL for requests '
-                                'for this client.'),
+                                'for this client. NOTE: The unversioned '
+                                'endpoint should be specified here; to '
+                                'request a particular API version, use the '
+                                '`version`, `min-version`, and/or '
+                                '`max-version` options.'),
                 cfg.StrOpt('version',
                            deprecated_opts=deprecated_opts.get('version'),
                            help='Minimum Major API version within a given '