diff --git a/etc/nova/nova-config-generator.conf b/etc/nova/nova-config-generator.conf index 2f5562c83622..b1694402a80c 100644 --- a/etc/nova/nova-config-generator.conf +++ b/etc/nova/nova-config-generator.conf @@ -18,3 +18,4 @@ namespace = oslo.versionedobjects namespace = keystonemiddleware.auth_token namespace = osprofiler namespace = os_vif +namespace = os_brick diff --git a/nova/cmd/compute.py b/nova/cmd/compute.py index a433aeb6931b..3d68892d805a 100644 --- a/nova/cmd/compute.py +++ b/nova/cmd/compute.py @@ -19,6 +19,7 @@ import shlex import sys +import os_brick import os_vif from oslo_log import log as logging from oslo_privsep import priv_context @@ -47,6 +48,7 @@ def main(): priv_context.init(root_helper=shlex.split(utils.get_root_helper())) objects.register_all() gmr_opts.set_defaults(CONF) + os_brick.setup(CONF) # Ensure os-vif objects are registered and plugins loaded os_vif.initialize() diff --git a/releasenotes/notes/lock_path-7a9f0230f3e25716.yaml b/releasenotes/notes/lock_path-7a9f0230f3e25716.yaml new file mode 100644 index 000000000000..45a6b18d59ec --- /dev/null +++ b/releasenotes/notes/lock_path-7a9f0230f3e25716.yaml @@ -0,0 +1,7 @@ +--- +features: + - | + On HCI deployments where Nova is collocated with the Cinder service or the + Glance using Cinder backend service, an os-brick shared location can be + configured using the ``lock_path`` in the ``[os_brick]`` configuration + section. diff --git a/requirements.txt b/requirements.txt index ba5c4dca5386..ee99fa57d419 100644 --- a/requirements.txt +++ b/requirements.txt @@ -50,7 +50,7 @@ rfc3986>=1.2.0 # Apache-2.0 oslo.middleware>=3.31.0 # Apache-2.0 psutil>=3.2.2 # BSD oslo.versionedobjects>=1.35.0 # Apache-2.0 -os-brick>=5.2 # Apache-2.0 +os-brick>=6.0 # Apache-2.0 os-resource-classes>=1.1.0 # Apache-2.0 os-traits>=3.1.0 # Apache-2.0 os-vif>=3.1.0 # Apache-2.0