Commit Graph

22 Commits

Author SHA1 Message Date
Zuul 95a02faf9c Merge "Include os-brick configuration options" 2022-07-13 08:11:31 +00:00
Gorka Eguileor d6f6b726f3 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
2022-07-12 11:35:04 +02:00
Takashi Kajinami 7e6a118dfd Add missing oslo_limit options
Glance now depends on the oslo.limit library to support the unified
quota[1], but parameters of the library are still missing from
glance-api.conf.

This change ensures the parameter of the oslo.limit library are
included in glance-api.conf generated by oslo-config-generator.

[1] 06e6542f15

Closes-Bug: #1946100
Change-Id: I56a2a9d8184f50624239b90dd9bef671c195fb90
2022-07-05 22:00:11 +09:00
Takashi Kajinami 08a0a738b3 Remove options for oslo.db thread pool support
Thread pool support in oslo.db was already deprecated[1], and it is not
actually used by Glance.

[1] 74c6bf266e0b86ceb4726cad9268f134d423bae8

Change-Id: I79e934f34f33953c821b6529a34e44dcf2a9688c
2022-06-24 09:20:41 +09:00
Zuul 1a0191d8f0 Merge "Add missing [oslo_reports] options" 2021-09-08 20:39:04 +00:00
Zuul 2984188eee Merge "Add missing parameters for the healthcheck middleware" 2021-09-08 20:38:59 +00:00
Takashi Kajinami d155c37693 Add missing [oslo_reports] options
The oslo.reports library provides some options under the [oslo_reports]
section. This change ensures these parameters are rendered by
the oslo-config-generator command.

Closes-Bug: #1940733
Change-Id: Icdfa374640e8962198790c30f4d0e0ec03b2f2cd
2021-08-21 17:22:51 +09:00
Takashi Kajinami 33f2875ce0 Load options from the castellan library
Currently Glance relies on the castellan library for encryption, but
the option for the library have been missing from glance-api.conf .
This change ensures options from the castellan library are rendered
into glance-api.conf by the oslo-config-generator command.

Closes-Bug: #1940090
Change-Id: I5b9459dfc3060ea40272d13f21ae87ff4ade64c5
2021-08-16 22:55:38 +09:00
Takashi Kajinami 2c2a1317af Add missing parameters for the healthcheck middleware
The healthcheck middleware was added to the api pipelines a long ago[1]
but parameters of the middleware are missing from the example
glance-api.conf file.
This change adds the oslo.config.opts endpoint so that the parameters
of the middleware are rendered by the oslo-config-generator command.

[1] 562cb0429f

Closes-Bug: #1939944
Change-Id: Ibf6839b3cf202b2a1b253c4687d08f072349513e
2021-08-14 22:15:20 +09:00
Erno Kuvaja da29e129fa Revert "Add reserved stores to the sample config file"
This patch introduced double registering of the same
config option groups which fails glance-api start
if reserved stores are actually defined.

The code utilizing these config options has not been
merged which prevented testing to catch this.

Closes-Bug: #1844108

This reverts commit 4265e61bc8.

Change-Id: Iaf338d29673e68a15d37fdda81add552e4175634
2019-09-19 12:40:34 +01:00
Brian Rosmaita 4265e61bc8 Add reserved stores to the sample config file
Since we know the names of the reserved stores, we can add them
to the config file to make it easier for operators to configure
these things.

Includes deprecation of the 'work_dir' and 'node_staging_uri'
options.

Change-Id: I992cf468f9ce156ba51b1dd025459939acd8dce0
2019-08-06 10:45:43 -04:00
Abhishek Kekane e8a0ba0fc7 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
2018-09-18 10:20:43 +00:00
Hemanth Makkapati 45003b0209 Wrap text in sample configuration files at 80
By default, the config generator wraps the text in configuration files
at 70. This destroys the formatting of our help text strings.
To preserve the formatting, we wrap it at 80 just like we do for code.

Change-Id: I1a9aff4a4c7ea09a8136b3a26d9c22fb270d6226
2016-08-02 13:58:53 +00:00
Fei Long Wang d04d3122f8 Fix duplicated osprofile config for registry
Now when generating the config samples of Glance, glance-api.conf,
glance-glare.conf and glance-registry.conf will include duplicated
config options for osprofiler. It's because we're collecting
osprofiler's options at two places: etc/oslo-config-generator and
glance/opts.py. So to remove the duplication and keep consistenty
with the other options format, the patch removes the collecting
from etc/oslo-config-generator.

Change-Id: I45ef0bc8453cb8894dc245b8acf390b9ee0f6bfd
2016-07-06 10:02:30 +12:00
Jamie Lennox b0d0b1d0ba Use http-proxy-to-wsgi middleware from oslo.middleware
The HTTP_X_FORWARDED_PROTO handling fails to handle the case of
redirecting the /v1 request to /v1/ because it is handled purely by
routes and does not enter the glance wsgi code. This means a https
request is redirect to http and fails.

oslo.middleware has middleware for handling the X-Forwarded-Proto header
in a standard way so that services don't have to and so we should use
that instead of our own mechanism.

Leaving the existing header handling around until removal should not be
a problem as the worst that will happen is it overwrites an existing
'https' header value set by the middleware.

Closes-Bug: #1558683
Closes-Bug: #1590608
Change-Id: I481d88020b6e8420ce4b9072dd30ec82fe3fb4f7
2016-06-09 09:52:04 +10:00
Dina Belova 790b01573a Use OSprofiler options consolidated in lib itself
Starting with 1.0.0 osprofiler release options needed for
its workability are consolidated inside osprofiler itself.
Let's use them.

Change-Id: Ib0266e0a6e9bfa99c4bacbdca623ab1211a822eb
2016-05-25 11:33:56 +03:00
Michael Krotscheck 761751064b Added CORS support to Glance
This adds the CORS support middleware to Glance, allowing a deployer
to optionally configure rules under which a javascript client may
break the single-origin policy and access the API directly.

For Glance, the paste.ini method of deploying the middleware was
chosen, because it needs to be able to annotate responses created
by keystonemiddleware. If the middleware were explicitly included
as in the previous patch, keystone would reject the request before
the cross-domain headers could be annotated, resulting in an
error response that was unreadable by the user agent.

A special consideration has been made to accomodate Glance's
nonstandard configuration files, by using 'glance-api' as the
value of oslo_config_project in paste.ini. This is to trigger
automatic oslo configuration loading for paste-loaded middleware,
in order to ensure that it finds glance-api.conf rather than
glance.conf.

DocImpact: Add link to CORS configuration in Admin Guide
OpenStack CrossProject Spec:
   http://specs.openstack.org/openstack/openstack-specs/specs/cors-support.html
Oslo_Middleware Docs:
   http://docs.openstack.org/developer/oslo.middleware/cors.html
OpenStack Cloud Admin Guide:
   http://docs.openstack.org/admin-guide-cloud/cross_project_cors.html

Change-Id: Icf5fb91a0b9e6736e70314c72c1c99c5f170ba53
2015-12-04 08:41:20 -08:00
Erno Kuvaja b1d2d938d2 Return missing authtoken options
Example configs were missing keystone_authtoken section after moving
to generated config files. This change returns that to generation.

Closes-Bug: #1500361

Change-Id: I6ee82c38061d483cea7254d155d9a72436880e84
2015-09-28 12:08:06 +00:00
Ian Cordasco cb7d5a4795 Use graduated oslo.policy
This change:

- Adds oslo.policy to the requirements list
- Accounts for changes in Enforcer initialization
- Accounts for changes to config options
- Removes incubated version of oslo.policy
- Updates the in-tree etc/config files

UpgradeImpact

Partially Implements Blueprint: graduate-policy
Change-Id: I5acb1e0f809098991f05ca3b6d78d4d88d98f2db
2015-03-17 23:50:02 -05:00
Louis Taylor 0acff569e0 Move to graduated oslo.log module
This removes the log module from the oslo incubator directory.

Change-Id: Ib017cc2777e27c58b376c3138c9fba614783cc34
2015-03-12 11:48:24 +00:00
Zhi Yan Liu 882049a613 Using oslo.concurrency lib
Replace processutils and lockutils modules of oslo-incubator with
oslo.concurrency lib.

Change-Id: Ic1af8753a70f1aada22efe8132e48cbc16e14f3f
Signed-off-by: Zhi Yan Liu <zhiyanl@cn.ibm.com>
2014-12-17 13:20:54 +08:00
Zhi Yan Liu 819f28a0b8 Enabling separated sample config file generation
As a common approach most projects used now and Oslo preferred, this
change enabled sample configuration file generation mechanism for
each Glance services.

This change, as an enhancement, allows generating separated sample
configuration files for each Glance major services, e.g.:

    etc/glance-api.conf.sample
    etc/glance-cache.conf.sample
    etc/glance-manage.conf.sample
    etc/glance-registry.conf.sample
    etc/glance-scrubber.conf.sample

It is different than I94d486d6686815c45705a7a9b00fb26062e1eb63
which only supports generating an unified sample configuration
file to including all Glance available options.

This mechanism  not only can help auditing by packager, milestone
maintainer or developer as a function (testenv) of tox, but also
those separated configuration files could make deployment be easy.
And it helps keeping sample configuration files be update with
code change.

The change added "genconfigs" function as a tox testenv (-egenconfigs),
and it dependes on oslo-config-generator function of oslo.config.

The change doesn't introduce those sample files Glance repo, so
next step is to investigate if we can generate them in gate
automatically when a change was merged.

Related-Change-Id: I15686708fc9460948a58cfea3d18dae40ba1fda9
Related-Change-Id: Iae31856d5886ee78786972d80c7c103c3460a2b3
Related-Change-Id: I76043b08e2872867e5af2a5ac902e4d092fda5c8
Closes-Bug: #1300546
Closes-Bug: #1361963

Change-Id: Ibe03a3fe80b96ca32acb1a6bea7e38e6075951bb
Signed-off-by: Zhi Yan Liu <zhiyanl@cn.ibm.com>
2014-09-17 13:19:00 +08:00