From 167dc4e1bd05f4c18828b9fa76dd5e86838d0940 Mon Sep 17 00:00:00 2001
From: Alan Bishop <abishop@redhat.com>
Date: Fri, 2 Feb 2018 15:37:49 +0000
Subject: [PATCH] Fix DuplicateOptError in fixed_key migration code

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

Closes-Bug: #1747021
Change-Id: I119a12c8e80ad991f5a2916fec2ef4421039b9e9
---
 cinder/keymgr/migration.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

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 ''