From 307296af5e170ca6b0d44fd5ec85a39bd6b5e572 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 13 Mar 2024 22:06:40 +0900 Subject: [PATCH] Deprecate templated catalog driver Keystone provided two in-tree catalog drivers, sql and templated. However the templated driver hasn't been properly maintained. The default template had not been updated for 8 years until it was recently updated by [1]. This deprecates the driver assuming it's not widely used and sql driver meets usual requirements. This also restores the image service endpoints which were wrongly removed by [1]. [1] c32bedb654d04176fdab9b3cb522dd3146cfea9c Related-Bug: #2013473 Change-Id: Iadb7bd5d7c4cf82aea2a7dbc1d8c4dbe53b9f763 --- etc/default_catalog.templates | 5 +++++ keystone/catalog/backends/templated.py | 2 ++ .../deprecate-templated-catalog-driver-f811a6040abdc4a8.yaml | 5 +++++ 3 files changed, 12 insertions(+) create mode 100644 releasenotes/notes/deprecate-templated-catalog-driver-f811a6040abdc4a8.yaml diff --git a/etc/default_catalog.templates b/etc/default_catalog.templates index 09dee53497..106d1cfe92 100644 --- a/etc/default_catalog.templates +++ b/etc/default_catalog.templates @@ -16,6 +16,11 @@ catalog.RegionOne.volumev3.adminURL = http://localhost:8776/v3 catalog.RegionOne.volumev3.internalURL = http://localhost:8776/v3 catalog.RegionOne.volumev3.name = Volume Service V3 +catalog.RegionOne.image.publicURL = http://localhost:9292 +catalog.RegionOne.image.adminURL = http://localhost:9292 +catalog.RegionOne.image.internalURL = http://localhost:9292 +catalog.RegionOne.image.name = Image Service + catalog.RegionOne.network.publicURL = http://localhost:9696 catalog.RegionOne.network.adminURL = http://localhost:9696 catalog.RegionOne.network.internalURL = http://localhost:9696 diff --git a/keystone/catalog/backends/templated.py b/keystone/catalog/backends/templated.py index 64bfb630a2..3370ef8e1b 100644 --- a/keystone/catalog/backends/templated.py +++ b/keystone/catalog/backends/templated.py @@ -83,6 +83,8 @@ class Catalog(base.CatalogDriverBase): def __init__(self, templates=None): super(Catalog, self).__init__() + LOG.warning('The templated catalog driver has been deprecated and ' + 'will be removed in a future release.') if templates: self.templates = templates else: diff --git a/releasenotes/notes/deprecate-templated-catalog-driver-f811a6040abdc4a8.yaml b/releasenotes/notes/deprecate-templated-catalog-driver-f811a6040abdc4a8.yaml new file mode 100644 index 0000000000..2264ab6a5a --- /dev/null +++ b/releasenotes/notes/deprecate-templated-catalog-driver-f811a6040abdc4a8.yaml @@ -0,0 +1,5 @@ +--- +deprecations: + - | + The templated catalog driver has been deprecated and will be removed in + a future release.