From 5d3a533b47975348dc7a6414083aa1412c285250 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Fri, 26 May 2017 06:46:00 -0400 Subject: [PATCH] Send request_id on cinder calls This changes the constructor so that cinder calls will carry forward the request_id to the cinder service. ``global_id`` is a magic property on new oslo.context which is either set to the global_request_id sent into Nova, or the local request id if it's not set. Depends-On: I527026c1c685e5156c410a2b84b2c19cebc71a49 oslo spec I65de8261746b25d45e105394f4eeb95b9cb3bd42 Change-Id: Ic5ee9161cd1174a2dd32b7f155194a7110cc5219 --- nova/volume/cinder.py | 1 + requirements.txt | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nova/volume/cinder.py b/nova/volume/cinder.py index c374680ecc87..c5469ed359c6 100644 --- a/nova/volume/cinder.py +++ b/nova/volume/cinder.py @@ -102,6 +102,7 @@ def cinderclient(context): auth=auth, endpoint_override=endpoint_override, connect_retries=CONF.cinder.http_retries, + global_request_id=context.global_id, **service_parameters) diff --git a/requirements.txt b/requirements.txt index 75eaeb857772..8e068926bc0b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -24,7 +24,7 @@ Babel!=2.4.0,>=2.3.4 # BSD enum34;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD iso8601>=0.1.11 # MIT jsonschema!=2.5.0,<3.0.0,>=2.0.0 # MIT -python-cinderclient>=2.0.1 # Apache-2.0 +python-cinderclient>=2.1.0 # Apache-2.0 keystoneauth1>=2.20.0 # Apache-2.0 python-neutronclient>=5.1.0 # Apache-2.0 python-glanceclient>=2.5.0 # Apache-2.0 @@ -36,7 +36,7 @@ websockify>=0.8.0 # LGPLv3 oslo.cache>=1.5.0 # Apache-2.0 oslo.concurrency>=3.8.0 # Apache-2.0 oslo.config>=3.22.0 # Apache-2.0 -oslo.context>=2.12.0 # Apache-2.0 +oslo.context>=2.14.0 # Apache-2.0 oslo.log>=3.22.0 # Apache-2.0 oslo.reports>=0.6.0 # Apache-2.0 oslo.serialization>=1.10.0 # Apache-2.0