summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/requirements.txt6
-rw-r--r--doc/source/conf.py9
-rw-r--r--keystonemiddleware/auth_token/_opts.py4
-rw-r--r--keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py6
-rw-r--r--lower-constraints.txt1
-rw-r--r--releasenotes/notes/change-default-identity-endpoint-fab39579255c31bb.yaml11
-rw-r--r--releasenotes/source/conf.py8
-rw-r--r--releasenotes/source/index.rst1
-rw-r--r--releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po40
-rw-r--r--releasenotes/source/ussuri.rst6
10 files changed, 71 insertions, 21 deletions
diff --git a/doc/requirements.txt b/doc/requirements.txt
index 9aad4bb..2499e0a 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -4,9 +4,9 @@
# For generating sphinx documentation
doc8>=0.6.0 # Apache-2.0
-openstackdocstheme>=1.20.0 # Apache-2.0
-reno>=2.5.0 # Apache-2.0
-sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD
+openstackdocstheme>=2.2.1 # Apache-2.0
+reno>=3.1.0 # Apache-2.0
+sphinx>=2.0.0,!=2.1.0 # BSD
sphinxcontrib-apidoc>=0.2.0 # BSD
# PDF Docs
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 4428242..4c39b3a 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -107,7 +107,7 @@ add_module_names = True
#show_authors = False
# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'native'
# A list of ignored prefixes for module index sorting.
modindex_common_prefix = ['keystonemiddleware.']
@@ -242,6 +242,7 @@ intersphinx_mapping = {'keystoneclient': (keystoneclient, None),
}
# -- Options for openstackdocstheme -------------------------------------------
-repository_name = 'openstack/keystonemiddleware'
-bug_project = 'keystonemiddleware'
-bug_tag = ''
+openstackdocs_repo_name = 'openstack/keystonemiddleware'
+openstackdocs_bug_project = 'keystonemiddleware'
+openstackdocs_bug_tag = ''
+openstackdocs_pdf_link = True
diff --git a/keystonemiddleware/auth_token/_opts.py b/keystonemiddleware/auth_token/_opts.py
index f16d3f8..15dd4f6 100644
--- a/keystonemiddleware/auth_token/_opts.py
+++ b/keystonemiddleware/auth_token/_opts.py
@@ -68,9 +68,9 @@ _OPTS = [
cfg.StrOpt('auth_version',
help='API version of the Identity API endpoint.'),
cfg.StrOpt('interface',
- default='admin',
+ default='internal',
help='Interface to use for the Identity API endpoint. Valid'
- ' values are "public", "internal" or "admin"(default).'),
+ ' values are "public", "internal" (default) or "admin".'),
cfg.BoolOpt('delay_auth_decision',
default=False,
help='Do not handle authorization requests within the'
diff --git a/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py b/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py
index 64586a9..1abe322 100644
--- a/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py
+++ b/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py
@@ -455,8 +455,8 @@ class GeneralAuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest,
west_versions = fixture.DiscoveryList(href=west_url)
s = token.add_service('identity')
- s.add_endpoint(interface='admin', url=east_url, region='east')
- s.add_endpoint(interface='admin', url=west_url, region='west')
+ s.add_endpoint(interface='internal', url=east_url, region='east')
+ s.add_endpoint(interface='internal', url=west_url, region='west')
self.requests_mock.get(auth_url, json=auth_versions)
self.requests_mock.get(east_url, json=east_versions)
@@ -1808,7 +1808,7 @@ class AuthProtocolLoadingTests(BaseAuthTokenMiddlewareTest):
admin_token_id = uuid.uuid4().hex
admin_token = fixture.V3Token(project_id=self.project_id)
s = admin_token.add_service('identity', name='keystone')
- s.add_standard_endpoints(admin=self.KEYSTONE_URL)
+ s.add_standard_endpoints(internal=self.KEYSTONE_URL)
self.requests_mock.post('%s/v3/auth/tokens' % self.AUTH_URL,
json=admin_token,
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 90c49e4..8fd4ac7 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -63,7 +63,6 @@ python-mimeparse==1.6.0
python-subunit==1.2.0
pytz==2018.3
PyYAML==3.12
-reno==2.5.0
requests-mock==1.2.0
requests==2.14.2
requestsexceptions==1.4.0
diff --git a/releasenotes/notes/change-default-identity-endpoint-fab39579255c31bb.yaml b/releasenotes/notes/change-default-identity-endpoint-fab39579255c31bb.yaml
new file mode 100644
index 0000000..48e9506
--- /dev/null
+++ b/releasenotes/notes/change-default-identity-endpoint-fab39579255c31bb.yaml
@@ -0,0 +1,11 @@
+---
+prelude: >
+ Since the removal of the Identity API v2 Keystone no longer has any
+ special functionality that requires using the admin endpoint for it. So
+ this release changes the default endpoint being used from ``admin`` to
+ ``internal``, allowing deployments to work without an admin endpoint.
+upgrade:
+ - |
+ [`bug 1830002 <https://bugs.launchpad.net/keystonemiddleware/+bug/1830002>`_]
+ The default Identity endpoint has been changed from ``admin`` to
+ ``internal``.
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 1be30eb..9d399ae 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -93,7 +93,7 @@ exclude_patterns = []
# show_authors = False
# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'native'
# A list of ignored prefixes for module index sorting.
# modindex_common_prefix = []
@@ -258,6 +258,6 @@ texinfo_documents = [
locale_dirs = ['locale/']
# -- Options for openstackdocstheme -------------------------------------------
-repository_name = 'openstack/keystonemiddleware'
-bug_project = 'keystonemiddleware'
-bug_tag = ''
+openstackdocs_repo_name = 'openstack/keystonemiddleware'
+openstackdocs_bug_project = 'keystonemiddleware'
+openstackdocs_bug_tag = ''
diff --git a/releasenotes/source/index.rst b/releasenotes/source/index.rst
index 7f0eeb6..b5063a2 100644
--- a/releasenotes/source/index.rst
+++ b/releasenotes/source/index.rst
@@ -6,6 +6,7 @@
:maxdepth: 1
unreleased
+ ussuri
train
stein
rocky
diff --git a/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po b/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po
index 0710425..56b9910 100644
--- a/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po
+++ b/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po
@@ -1,15 +1,16 @@
# Andi Chandler <andi@gowling.com>, 2017. #zanata
# Andi Chandler <andi@gowling.com>, 2018. #zanata
# Andi Chandler <andi@gowling.com>, 2019. #zanata
+# Andi Chandler <andi@gowling.com>, 2020. #zanata
msgid ""
msgstr ""
"Project-Id-Version: keystonemiddleware\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-12-21 02:49+0000\n"
+"POT-Creation-Date: 2020-06-05 04:54+0000\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2019-12-21 02:38+0000\n"
+"PO-Revision-Date: 2020-06-15 05:35+0000\n"
"Last-Translator: Andi Chandler <andi@gowling.com>\n"
"Language-Team: English (United Kingdom)\n"
"Language: en_GB\n"
@@ -28,6 +29,9 @@ msgstr "4.16.0"
msgid "4.17.1"
msgstr "4.17.1"
+msgid "4.17.1-3"
+msgstr "4.17.1-3"
+
msgid "4.18.0"
msgstr "4.18.0"
@@ -61,20 +65,29 @@ msgstr "5.2.0"
msgid "5.2.1"
msgstr "5.2.1"
+msgid "5.2.2"
+msgstr "5.2.2"
+
msgid "5.3.0"
msgstr "5.3.0"
msgid "6.0.0"
msgstr "6.0.0"
+msgid "6.0.1"
+msgstr "6.0.1"
+
msgid "6.1.0"
msgstr "6.1.0"
msgid "7.0.0"
msgstr "7.0.0"
-msgid "7.0.1-8"
-msgstr "7.0.1-8"
+msgid "8.0.0"
+msgstr "8.0.0"
+
+msgid "9.0.0"
+msgstr "9.0.0"
msgid ""
"A new configuration option for the s3token middleware called auth_uri can be "
@@ -160,6 +173,15 @@ msgstr "Pike Series Release Notes"
msgid "Prelude"
msgstr "Prelude"
+msgid ""
+"Python 2.7 support has been dropped. Last release of keystonemiddleware to "
+"support python 2.7 is OpenStack Train. The minimum version of Python now "
+"supported is Python 3.6."
+msgstr ""
+"Python 2.7 support has been dropped. Last release of keystonemiddleware to "
+"support Python 2.7 is OpenStack Train. The minimum version of Python now "
+"supported is Python 3.6."
+
msgid "Queens Series Release Notes"
msgstr "Queens Series Release Notes"
@@ -235,12 +257,22 @@ msgstr ""
"returned when the user needs to be redirected to the Identity service for "
"authentication."
+msgid ""
+"The lower constraint for python-memcached must be raised to version 1.58 in "
+"order to work with Python 3.4 and above."
+msgstr ""
+"The lower constraint for python-memcached must be raised to version 1.58 in "
+"order to work with Python 3.4 and above."
+
msgid "Train Series Release Notes"
msgstr "Train Series Release Notes"
msgid "Upgrade Notes"
msgstr "Upgrade Notes"
+msgid "Ussuri Series Release Notes"
+msgstr "Ussuri Series Release Notes"
+
msgid ""
"When ``delay_auth_decision`` is enabled and a Keystone failure prevents a "
"final decision about whether a token is valid or invalid, it will be marked "
diff --git a/releasenotes/source/ussuri.rst b/releasenotes/source/ussuri.rst
new file mode 100644
index 0000000..e21e50e
--- /dev/null
+++ b/releasenotes/source/ussuri.rst
@@ -0,0 +1,6 @@
+===========================
+Ussuri Series Release Notes
+===========================
+
+.. release-notes::
+ :branch: stable/ussuri
View Lorry Controller Status