openstack/cinder
Code Issues Proposed changes

Fix DuplicateOptError in fixed_key migration code

Browse Source 
Fix how the key migration code loads the fixed_key config option so that
it handles DuplicateOptError.

Closes-Bug: #1747021
Change-Id: I119a12c8e80ad991f5a2916fec2ef4421039b9e9
This commit is contained in:
Alan Bishop 2018-02-02 15:37:49 +00:00
parent eee1d29e0a
commit 167dc4e1bd
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cinder/keymgr/migration.py
View File

@ -44,9 +44,12 @@ class KeyMigrator(object):
def handle_key_migration(self, volumes): def handle_key_migration(self, volumes):
castellan_options.set_defaults(self.conf) castellan_options.set_defaults(self.conf)
try:
self.conf.import_opt(name='fixed_key', self.conf.import_opt(name='fixed_key',
module_str='cinder.keymgr.conf_key_mgr', module_str='cinder.keymgr.conf_key_mgr',
group='key_manager') group='key_manager')
except cfg.DuplicateOptError:
pass
fixed_key = self.conf.key_manager.fixed_key fixed_key = self.conf.key_manager.fixed_key
backend = self.conf.key_manager.backend or '' backend = self.conf.key_manager.backend or ''