From e8a0ba0fc7671b32a9ec89eb6386a3680a7413e2 Mon Sep 17 00:00:00 2001
From: Abhishek Kekane <akekane@redhat.com>
Date: Tue, 18 Sep 2018 09:34:40 +0000
Subject: [PATCH] Provision to add new config options in sample config file

In Rocky we have added support for multiple backend as a EXPERIMENTAL
feature. However configuration options related to multiple backend
are not generated in sample config file due to some issue. We have
added below 2 new config options for multiple backend.

1. enabled_backneds (added in glance)
2. default_backend (added in glance_store)

Made provision to add all the above options to sample config
file.

Depends-On: https://review.openstack.org/#/c/603331/
Change-Id: Iff3db9fe31243e5b9610742c796fdca84c698bcf
Closes-Bug: #1793057
---
 etc/oslo-config-generator/glance-api.conf | 1 +
 glance/opts.py                            | 1 +
 2 files changed, 2 insertions(+)

diff --git a/etc/oslo-config-generator/glance-api.conf b/etc/oslo-config-generator/glance-api.conf
index 31bdbaabcd..324a14e590 100644
--- a/etc/oslo-config-generator/glance-api.conf
+++ b/etc/oslo-config-generator/glance-api.conf
@@ -3,6 +3,7 @@ wrap_width = 80
 output_file = etc/glance-api.conf.sample
 namespace = glance.api
 namespace = glance.store
+namespace = glance.multi_store
 namespace = oslo.concurrency
 namespace = oslo.messaging
 namespace = oslo.db
diff --git a/glance/opts.py b/glance/opts.py
index 93caf40f6d..7cabd40905 100644
--- a/glance/opts.py
+++ b/glance/opts.py
@@ -60,6 +60,7 @@ _api_opts = [
         glance.common.wsgi.eventlet_opts,
         glance.common.wsgi.socket_opts,
         glance.common.wsgi.wsgi_opts,
+        glance.common.wsgi.store_opts,
         glance.image_cache.drivers.sqlite.sqlite_opts,
         glance.image_cache.image_cache_opts,
         glance.notifier.notifier_opts,