Refactor oslo.conf handling for tool scripts

Move the oslo.conf handling for tool scripts to a module that can be
reused.

Change-Id: I3852a89d246bc368697982667af9d6894b29d5a3
This commit is contained in:
Doug Hellmann 2015-01-15 20:04:12 +00:00
parent 3ea6056eac
commit 48610a25d1
2 changed files with 51 additions and 25 deletions

View File

@ -19,35 +19,13 @@ from __future__ import print_function
import os
from oslo.config import cfg
import oslo_tool_config as cfg
import yaml
DEFAULT_CONFIG_FILES = [
'./oslo.conf',
os.path.expanduser('~/.oslo.conf'),
]
def main():
conf = cfg.ConfigOpts()
conf.register_cli_opt(
cfg.StrOpt(
'repo_root',
default='.',
help='directory containing the git repositories',
)
)
# Look for a few configuration files, and load the ones we find.
default_config_files = [
f
for f in DEFAULT_CONFIG_FILES
if os.path.exists(f)
]
conf(
project='oslo',
default_config_files=default_config_files,
)
conf = cfg.get_config_parser()
cfg.parse_arguments(conf)
# Find the governance repository.
gov_repo = os.path.expanduser(os.path.join(conf.repo_root,

48
oslo_tool_config.py Normal file
View File

@ -0,0 +1,48 @@
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
"""Utilities functions for working with oslo.config from the tool scripts.
"""
import os
from oslo.config import cfg
DEFAULT_CONFIG_FILES = [
'./oslo.conf',
os.path.expanduser('~/.oslo.conf'),
]
def get_config_parser():
conf = cfg.ConfigOpts()
conf.register_cli_opt(
cfg.StrOpt(
'repo_root',
default='.',
help='directory containing the git repositories',
)
)
return conf
def parse_arguments(conf):
# Look for a few configuration files, and load the ones we find.
default_config_files = [
f
for f in DEFAULT_CONFIG_FILES
if os.path.exists(f)
]
return conf(
project='oslo',
default_config_files=default_config_files,
)