summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGorka Eguileor <geguileo@redhat.com>2022-07-08 12:39:49 +0200
committerGorka Eguileor <geguileo@redhat.com>2022-07-12 11:35:04 +0200
commitd6f6b726f34bc1532dad9abfb601b905c64a600b (patch)
treea78c9b8d5392e458056e6fa2cc09873c306c490b
parentc66705069bfbc30c5c81ce2522738278bead90fc (diff)
downloadglance-d6f6b726f34bc1532dad9abfb601b905c64a600b.tar.gz
Include os-brick configuration options
The cinder glance store now supports using an os-brick specific location for file locks instead of using the one defined for the whole service using the ``lock_path`` configuration option in the ``os_brick`` configuration section. To render this option when generating the sample config file with ``tox -egenconfig``, the ``os_brick`` namespace needs to be configured in the oslo-config-generator config files and the os-brick dependency needs to be present. This patch adds the os-brick package as a dependency in the genconfig test environment and adds the namespace to the relevant config files. Depends-On: Ib11d63e3c388e12f145f40247d17030a566b8c5e Change-Id: Ie25ab8bcc01a57e26da6a951e899659ec1782140
-rw-r--r--etc/oslo-config-generator/glance-api.conf1
-rw-r--r--etc/oslo-config-generator/glance-cache.conf1
-rw-r--r--etc/oslo-config-generator/glance-scrubber.conf1
3 files changed, 3 insertions, 0 deletions
diff --git a/etc/oslo-config-generator/glance-api.conf b/etc/oslo-config-generator/glance-api.conf
index 8e1dc06c0..eaff46c79 100644
--- a/etc/oslo-config-generator/glance-api.conf
+++ b/etc/oslo-config-generator/glance-api.conf
@@ -4,6 +4,7 @@ output_file = etc/glance-api.conf.sample
namespace = castellan.config
namespace = glance.api
namespace = glance.store
+namespace = os_brick
namespace = glance.multi_store
namespace = oslo.concurrency
namespace = oslo.messaging
diff --git a/etc/oslo-config-generator/glance-cache.conf b/etc/oslo-config-generator/glance-cache.conf
index 9bc1ff6b8..b520e8d9c 100644
--- a/etc/oslo-config-generator/glance-cache.conf
+++ b/etc/oslo-config-generator/glance-cache.conf
@@ -3,5 +3,6 @@ wrap_width = 80
output_file = etc/glance-cache.conf.sample
namespace = glance.cache
namespace = glance.store
+namespace = os_brick
namespace = oslo.log
namespace = oslo.policy
diff --git a/etc/oslo-config-generator/glance-scrubber.conf b/etc/oslo-config-generator/glance-scrubber.conf
index 700f1ecac..84d8abf36 100644
--- a/etc/oslo-config-generator/glance-scrubber.conf
+++ b/etc/oslo-config-generator/glance-scrubber.conf
@@ -3,6 +3,7 @@ wrap_width = 80
output_file = etc/glance-scrubber.conf.sample
namespace = glance.scrubber
namespace = glance.store
+namespace = os_brick
namespace = oslo.concurrency
namespace = oslo.db
namespace = oslo.log