commit 20661787b54010fa1bb729f97eab04dc8ccbc7b4
author Jenkins <jenkins@review.openstack.org> Wed Sep 09 09:35:28 2015 +0000
committer Gerrit Code Review <review@openstack.org> Wed Sep 09 09:35:28 2015 +0000
tree 1615768cc9301871fd4481c4881e48971604bcc2
parent 35a3a252260cb42ce1bad0061edbc715778eec7b
parent f58b9fd65632165560484df39912945dce813842

Merge "Fix identity new endpoint_type options for old users"

tempest/config.py

diff --git a/tempest/config.py b/tempest/config.py
index 5721c27..7655c75 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -117,9 +117,7 @@
                choices=['public', 'admin', 'internal',
                         'publicURL', 'adminURL', 'internalURL'],
                help="The admin endpoint type to use for OpenStack Identity "
-                    "(Keystone) API v2",
-               deprecated_opts=[cfg.DeprecatedOpt('endpoint_type',
-                                                  group='identity')]),
+                    "(Keystone) API v2"),
     cfg.StrOpt('v2_public_endpoint_type',
                default='publicURL',
                choices=['public', 'admin', 'internal',
@@ -133,9 +131,7 @@
                choices=['public', 'admin', 'internal',
                         'publicURL', 'adminURL', 'internalURL'],
                help="The endpoint type to use for OpenStack Identity "
-                    "(Keystone) API v3",
-               deprecated_opts=[cfg.DeprecatedOpt('endpoint_type',
-                                                  group='identity')]),
+                    "(Keystone) API v3"),
     cfg.StrOpt('username',
                help="Username to use for Nova API requests."),
     cfg.StrOpt('tenant_name',