diff --git a/heat/common/config.py b/heat/common/config.py index 27c643c389..72d1aaf092 100644 --- a/heat/common/config.py +++ b/heat/common/config.py @@ -65,7 +65,7 @@ service_opts = [ cfg.StrOpt('region_name_for_shared_services', help=_('Region name for shared services endpoints.')), cfg.ListOpt('shared_services_types', - default=['image', 'volume', 'volumev2', 'volumev3'], + default=['image', 'volume', 'volumev3'], help=_('The shared services located in the other region.' 'Needs region_name_for_shared_services option to ' 'be set for this to take effect.')), diff --git a/heat/engine/clients/os/cinder.py b/heat/engine/clients/os/cinder.py index 7d4c37a46a..55b7755424 100644 --- a/heat/engine/clients/os/cinder.py +++ b/heat/engine/clients/os/cinder.py @@ -34,7 +34,7 @@ class CinderClientPlugin(os_client.ExtensionMixin, exceptions_module = exceptions - service_types = [VOLUME_V2, VOLUME_V3] = ['volumev2', 'volumev3'] + service_types = [VOLUME_V3] = ['volumev3'] def get_volume_api_version(self): '''Returns the most recent API version.''' @@ -46,14 +46,7 @@ class CinderClientPlugin(os_client.ExtensionMixin, self.service_type = self.VOLUME_V3 self.client_version = '3' except ks_exceptions.EndpointNotFound: - try: - self.context.keystone_session.get_endpoint( - service_type=self.VOLUME_V2, - interface=self.interface) - self.service_type = self.VOLUME_V2 - self.client_version = '2' - except ks_exceptions.EndpointNotFound: - raise exception.Error(_('No volume service available.')) + raise exception.Error(_('No volume service available.')) def _create(self): self.get_volume_api_version() diff --git a/releasenotes/notes/volumev2-removal-13eeb4d7192578ee.yaml b/releasenotes/notes/volumev2-removal-13eeb4d7192578ee.yaml new file mode 100644 index 0000000000..6489c73e99 --- /dev/null +++ b/releasenotes/notes/volumev2-removal-13eeb4d7192578ee.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + Support for Block Storage API v2 has been removed.