diff --git a/cinder/keymgr/migration.py b/cinder/keymgr/migration.py index 876a1476f70..fbf6c153d48 100644 --- a/cinder/keymgr/migration.py +++ b/cinder/keymgr/migration.py @@ -44,9 +44,12 @@ class KeyMigrator(object): def handle_key_migration(self, volumes): castellan_options.set_defaults(self.conf) - self.conf.import_opt(name='fixed_key', - module_str='cinder.keymgr.conf_key_mgr', - group='key_manager') + try: + self.conf.import_opt(name='fixed_key', + module_str='cinder.keymgr.conf_key_mgr', + group='key_manager') + except cfg.DuplicateOptError: + pass fixed_key = self.conf.key_manager.fixed_key backend = self.conf.key_manager.backend or ''