f65d436c11
Now that enough time has passed, the keymgr code that was deprecated for removal can be removed. Barbican is the default option for Castellan, but Barbican is not part of default DevStack yet. Until Barbican is used by default in the dsvm gates, ConfKeyManager (the fixed_key key manager) should be set in DevStack, which was added with I733279864ee1a4aaffc9c8eed81b5e12f8d8821b. Change-Id: I82ee74f3d2629281dc8116af55f6a7b5398fc473
64 lines
2.3 KiB
Python
64 lines
2.3 KiB
Python
# Copyright 2016 OpenStack Foundation
|
|
# 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 castellan import options as castellan_opts
|
|
from oslo_config import cfg
|
|
|
|
key_manager_group = cfg.OptGroup(
|
|
'key_manager',
|
|
title='Key manager options')
|
|
|
|
key_manager_opts = [
|
|
# TODO(raj_singh): Deprecate or move this option to The Castellan library
|
|
# NOTE(kfarr): The ability to use fixed_key should be deprecated and
|
|
# removed and Barbican should be tested in the gate instead
|
|
cfg.StrOpt(
|
|
'fixed_key',
|
|
deprecated_group='keymgr',
|
|
help="""
|
|
Fixed key returned by key manager, specified in hex.
|
|
|
|
Possible values:
|
|
|
|
* Empty string or a key in hex value
|
|
"""),
|
|
]
|
|
|
|
|
|
def register_opts(conf):
|
|
castellan_opts.set_defaults(conf)
|
|
conf.register_group(key_manager_group)
|
|
conf.register_opts(key_manager_opts, group=key_manager_group)
|
|
|
|
|
|
def list_opts():
|
|
# Castellan library also has a group name key_manager. So if
|
|
# we append list returned from Castellan to this list, oslo will remove
|
|
# one group as duplicate and only one group (either from this file or
|
|
# Castellan library) will show up. So fix is to merge options of same
|
|
# group name from this file and Castellan library
|
|
opts = {key_manager_group.name: key_manager_opts}
|
|
for group, options in castellan_opts.list_opts():
|
|
if group not in opts.keys():
|
|
opts[group] = options
|
|
else:
|
|
opts[group] = opts[group] + options
|
|
return opts
|
|
# TODO(raj_singh): When the last option "fixed_key" is removed/moved from
|
|
# this file, then comment in code below and delete the code block above.
|
|
# Castellan already returned a list which can be returned
|
|
# directly from list_opts()
|
|
# return castellan_opts.list_opts()
|