Merge "Remove deprecated SHOW_KEYSTONE_V2_RC config option"

1 files changed, 1 insertions, 37 deletions

diff --git a/doc/source/configuration/settings.rst b/doc/source/configuration/settings.rst
index 0a8c29051..11f288d7d 100644
--- a/doc/source/configuration/settings.rst
+++ b/doc/source/configuration/settings.rst
@@ -921,25 +921,6 @@ menu and the api access panel.
    `OPENSTACK_CLOUDS_YAML_CUSTOM_TEMPLATE`_ to provide a custom
    ``clouds.yaml``.
 
-SHOW_KEYSTONE_V2_RC
---------------------
-
-.. versionadded:: 13.0.0(Queens)
-
-.. versionchanged:: 15.0.0(Stein)
-
-    The default value is changed from ``True`` to ``False``
-    in favor of the deprecation of keystone v2 API support in horizon.
-
-.. deprecated:: 15.0.0(Stein)
-
-    This option will be dropped in 16.0.0(Train) release.
-
-Default: ``False``
-
-Controls whether the keystone v2 openrc file is accessible from the user
-menu and the api access panel.
-
 THEME_COLLECTION_DIR
 --------------------
 
@@ -967,7 +948,7 @@ USER_MENU_LINKS
 
 .. versionadded:: 13.0.0(Queens)
 
-Default (when ``SHOW_KEYSTONE_V2_RC`` is ``False``):
+Default:
 
 .. code-block:: python
 
@@ -979,23 +960,6 @@ Default (when ``SHOW_KEYSTONE_V2_RC`` is ``False``):
      }
   ]
 
-Default (when ``SHOW_KEYSTONE_V2_RC`` is ``True``):
-
-.. code-block:: python
-
-  [
-    {'name': _('OpenStack RC File v2'),
-     'icon_classes': ['fa-download', ],
-     'url': 'horizon:project:api_access:openrcv2',
-     'external': False,
-     },
-    {'name': _('OpenStack RC File v3'),
-     'icon_classes': ['fa-download', ],
-     'url': 'horizon:project:api_access:openrc',
-     'external': False,
-     }
-  ]
-
 This setting controls the additional links on the user drop down menu.
 A list of dictionaries defining all of the links should be provided. This
 defaults to the standard OpenStack RC files.