From 9b19db099d9666810845ba5b7be9aff12c5d536d Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang Date: Thu, 7 Jan 2016 20:28:31 +0800 Subject: Fix the package source don't register issue Closes-Bug: #1531848 Change-Id: I3c6ceb9f1f367b8b19ab1b1d06c67817ab93cabb --- kolla/common/config.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'kolla/common') diff --git a/kolla/common/config.py b/kolla/common/config.py index f5d8f48d7..435f8ba19 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -225,7 +225,7 @@ SOURCES = { } -def _get_source_opt(type_, location, reference=None): +def get_source_opts(type_=None, location=None, reference=None): return [cfg.StrOpt('type', choices=['git', 'url'], default=type_, help='Source location type'), @@ -236,19 +236,19 @@ def _get_source_opt(type_, location, reference=None): 'or branch name'))] -def gen_source_opts(): +def gen_all_source_opts(): for name, params in SOURCES.iteritems(): type_ = params['type'] location = params['location'] reference = params.get('reference') - yield name, _get_source_opt(type_, location, reference) + yield name, get_source_opts(type_, location, reference) def list_opts(): return itertools.chain([(None, _CLI_OPTS), (None, _BASE_OPTS), ('profiles', _PROFILE_OPTS)], - gen_source_opts(), + gen_all_source_opts(), ) @@ -257,6 +257,8 @@ def parse(conf, args, usage=None, prog=None, conf.register_cli_opts(_CLI_OPTS) conf.register_opts(_BASE_OPTS) conf.register_opts(_PROFILE_OPTS, group='profiles') + for name, opts in gen_all_source_opts(): + conf.register_opts(opts, name) conf(args=args, project='kolla', -- cgit v1.2.3