Browse Source
Centralize config option of docker_registry section. Replace oslo_conf cfg to magnum.conf. Change-Id: I43d3ce068bb6638f71ea14577f34c1df3d7c9d8c Implements: blueprint centralize-config-magnumchanges/09/358509/8
11 changed files with 53 additions and 78 deletions
@ -0,0 +1,38 @@
|
||||
# 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. |
||||
|
||||
from oslo_config import cfg |
||||
|
||||
from magnum.i18n import _ |
||||
|
||||
docker_registry_group = cfg.OptGroup(name='docker_registry', |
||||
title='Options for Docker Registry') |
||||
|
||||
docker_registry_opts = [ |
||||
cfg.StrOpt('swift_region', |
||||
help=_('Region name of Swift')), |
||||
cfg.StrOpt('swift_registry_container', |
||||
default='docker_registry', |
||||
help=_('Name of the container in Swift which docker registry ' |
||||
'stores images in')) |
||||
] |
||||
|
||||
|
||||
def register_opts(conf): |
||||
conf.register_group(docker_registry_group) |
||||
conf.register_opts(docker_registry_opts, group=docker_registry_group) |
||||
|
||||
|
||||
def list_opts(): |
||||
return { |
||||
docker_registry_group: docker_registry_opts |
||||
} |
@ -1,23 +0,0 @@
|
||||
# Copyright 2014 |
||||
# The Cloudscaling Group, Inc. |
||||
# |
||||
# 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 magnum.drivers.common.template_def |
||||
|
||||
|
||||
def list_opts(): |
||||
return [ |
||||
('docker_registry', |
||||
magnum.drivers.common.template_def.docker_registry_opts) |
||||
] |
@ -1,28 +0,0 @@
|
||||
# Copyright 2015 NEC Corporation. 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. |
||||
|
||||
from oslo_config import cfg |
||||
import six |
||||
|
||||
from magnum import opts |
||||
from magnum.tests import base |
||||
|
||||
|
||||
class OptsTestCase(base.BaseTestCase): |
||||
|
||||
def test_list_opts(self): |
||||
for group_name, opt_list in opts.list_opts(): |
||||
self.assertIsInstance(group_name, six.string_types) |
||||
for opt in opt_list: |
||||
self.assertIsInstance(opt, cfg.Opt) |
Loading…
Reference in new issue