25d9af18bc
The Oslo libraries have moved all of their code out of the 'oslo' namespace package into per-library packages. The namespace package was retained during kilo for backwards compatibility, but will be removed by the liberty-2 milestone. This change removes the use of the namespace package, replacing it with the new package names. The patches in the libraries will be put on hold until application patches have landed, or L2, whichever comes first. At that point, new versions of the libraries without namespace packages will be released as a major version update. Please merge this patch, or an equivalent, before L2 to avoid problems with those library releases. Blueprint: remove-namespace-packages https://blueprints.launchpad.net/oslo-incubator/+spec/remove-namespace-packages Change-Id: Ib86c36f81f6fdbee64d88dd0b1d126bcc16649ac
114 lines
3.7 KiB
Python
114 lines
3.7 KiB
Python
# Copyright 2014 Mirantis Inc.
|
|
# All Rights Reserved.
|
|
#
|
|
# 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.
|
|
|
|
import copy
|
|
import os
|
|
|
|
from oslo_config import cfg
|
|
import oslo_log._options as log_options
|
|
|
|
# 1. Define opts
|
|
|
|
# "auth_opts" are used by functional tests that are located in
|
|
# directory "%project_root%/manilaclient/tests/functional"
|
|
auth_opts = [
|
|
cfg.StrOpt("username",
|
|
default=None,
|
|
help="This should be the username of a user WITHOUT "
|
|
"administrative privileges."),
|
|
cfg.StrOpt("tenant_name",
|
|
default=None,
|
|
help="The non-administrative user's tenant name."),
|
|
cfg.StrOpt("password",
|
|
default=None,
|
|
help="The non-administrative user's password."),
|
|
cfg.StrOpt("auth_url",
|
|
default=None,
|
|
help="URL for where to find the OpenStack Identity admin "
|
|
"API endpoint."),
|
|
cfg.StrOpt("admin_username",
|
|
default=None,
|
|
help="This should be the username of a user WITH "
|
|
"administrative privileges."),
|
|
cfg.StrOpt("admin_tenant_name",
|
|
default=None,
|
|
help="The administrative user's tenant name."),
|
|
cfg.StrOpt("admin_password",
|
|
default=None,
|
|
help="The administrative user's password."),
|
|
cfg.StrOpt("admin_auth_url",
|
|
default=None,
|
|
help="URL for where to find the OpenStack Identity admin "
|
|
"API endpoint."),
|
|
]
|
|
|
|
base_opts = [
|
|
cfg.StrOpt("manila_exec_dir",
|
|
default=os.environ.get(
|
|
'OS_MANILA_EXEC_DIR',
|
|
os.path.join(os.path.abspath('.'), '.tox/functional/bin')),
|
|
help="The path to manilaclient to be executed."),
|
|
cfg.BoolOpt("suppress_errors_in_cleanup",
|
|
default=True,
|
|
help="Whether to suppress errors with clean up operation "
|
|
"or not."),
|
|
]
|
|
|
|
# 2. Generate config
|
|
|
|
PROJECT_NAME = 'manilaclient'
|
|
|
|
DEFAULT_CONFIG_FILE = (
|
|
os.environ.get('OS_%s_CONFIG_FILE' % PROJECT_NAME.upper()) or
|
|
'%s.conf' % PROJECT_NAME)
|
|
DEFAULT_CONFIG_DIR = (
|
|
os.environ.get('OS_%s_CONFIG_DIR' % PROJECT_NAME.upper()) or
|
|
os.path.join(os.path.abspath(os.path.dirname(os.path.dirname(__file__))),
|
|
"etc/manilaclient")
|
|
)
|
|
DEFAULT_CONFIG_PATH = os.path.join(DEFAULT_CONFIG_DIR, DEFAULT_CONFIG_FILE)
|
|
FAILOVER_CONFIG_PATH = '/etc/%(pn)s/%(cn)s' % {
|
|
'pn': PROJECT_NAME, 'cn': DEFAULT_CONFIG_FILE}
|
|
CONFIG_FILES = []
|
|
|
|
if os.path.isfile(DEFAULT_CONFIG_PATH):
|
|
CONFIG_FILES.append(DEFAULT_CONFIG_PATH)
|
|
if os.path.isfile(FAILOVER_CONFIG_PATH):
|
|
CONFIG_FILES.append(FAILOVER_CONFIG_PATH)
|
|
|
|
CONF = cfg.CONF
|
|
|
|
if CONFIG_FILES:
|
|
CONF([], project=PROJECT_NAME, default_config_files=CONFIG_FILES)
|
|
else:
|
|
CONF([], project=PROJECT_NAME)
|
|
|
|
# 3. Register opts
|
|
|
|
CONF.register_opts(auth_opts)
|
|
CONF.register_opts(base_opts)
|
|
|
|
# 4. Define list_opts for config sample generator
|
|
|
|
|
|
def list_opts():
|
|
"""Return a list of oslo_config options available in Manilaclient."""
|
|
opts = [
|
|
(None, copy.deepcopy(auth_opts)),
|
|
(None, copy.deepcopy(base_opts)),
|
|
]
|
|
opts.extend(log_options.list_opts())
|
|
return opts
|