summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-10-11 09:32:17 +0000
committerGerrit Code Review <review@openstack.org>2018-10-11 09:32:17 +0000
commit018ff32fe0200a041297c386eb8b381f1bec0e71 (patch)
tree99fcbba34cd75f4e2b2c4fe713560e81c8d20de5
parent8fab740c40b3fe396c7f675ecab4635392a08f7e (diff)
parent6ed05135a8b25c811f980950d88635e68bfbf179 (diff)
downloadceilometer-11.0.1.tar.gz
Merge "Volume discovery minimum 3.43 api version" into stable/rocky11.0.1
-rw-r--r--ceilometer/volume/discovery.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/ceilometer/volume/discovery.py b/ceilometer/volume/discovery.py
index 65c84348..eefa36de 100644
--- a/ceilometer/volume/discovery.py
+++ b/ceilometer/volume/discovery.py
@@ -28,8 +28,10 @@ class _BaseDiscovery(plugin_base.DiscoveryBase):
def __init__(self, conf):
super(_BaseDiscovery, self).__init__(conf)
creds = conf.service_credentials
+ # NOTE(tobias-urdin): We set 3.43 (the maximum for Pike) because
+ # we need atleast 3.41 to get user_id on snapshots.
self.client = cinder_client.Client(
- version='3',
+ version='3.43',
session=keystone_client.get_session(conf),
region_name=creds.region_name,
interface=creds.interface,