summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--glance_store/_drivers/cinder.py2
-rw-r--r--releasenotes/notes/lock_path-cef9d6f5f52c3211.yaml12
2 files changed, 14 insertions, 0 deletions
diff --git a/glance_store/_drivers/cinder.py b/glance_store/_drivers/cinder.py
index feee5ac..8a50862 100644
--- a/glance_store/_drivers/cinder.py
+++ b/glance_store/_drivers/cinder.py
@@ -45,6 +45,7 @@ try:
from cinderclient import api_versions
from cinderclient import exceptions as cinder_exception
from cinderclient.v3 import client as cinderclient
+ import os_brick
from os_brick.initiator import connector
from oslo_privsep import priv_context
except ImportError:
@@ -480,6 +481,7 @@ class Store(glance_store.driver.Store):
else:
self.store_conf = self.conf.glance_store
self.volume_api = cinder_utils.API()
+ getattr(os_brick, 'setup', lambda x: None)(CONF)
def _set_url_prefix(self):
self._url_prefix = "cinder://"
diff --git a/releasenotes/notes/lock_path-cef9d6f5f52c3211.yaml b/releasenotes/notes/lock_path-cef9d6f5f52c3211.yaml
new file mode 100644
index 0000000..bcb13d3
--- /dev/null
+++ b/releasenotes/notes/lock_path-cef9d6f5f52c3211.yaml
@@ -0,0 +1,12 @@
+---
+features:
+ - |
+ When using the cinder backend, a custom os-brick file lock location can be
+ specified using the ``lock_path`` configuration option in the
+ ``[os_brick]`` configuration section. Helpful when deploying on the same
+ host as the Cinder service.
+upgrade:
+ - |
+ When running Cinder and Glance with Cinder backend on the same host an
+ os-brick shared location can be configured using the ``lock_path`` in the
+ ``[os_brick]`` configuration section.