1 Although the following patch has been addressed in Icehouse 2014.1, it |
|
2 still has not yet been released for Havana. It has been modified to |
|
3 apply cleanly into our current Havana implementation |
|
4 |
|
5 commit 3badd1ffbe8796d27b924f882ed05b8d3f4f0f11 |
|
6 Author: Dan Prince <[email protected]> |
|
7 Date: Tue Dec 10 14:51:32 2013 -0500 |
|
8 |
|
9 Lazy log the fixed_key warnings |
|
10 |
|
11 Cinder currently spews quite a bit of WARNINGs like this with |
|
12 the default settings: |
|
13 |
|
14 WARNING cinder.keymgr.conf_key_mgr [-] config option keymgr.fixed_key |
|
15 has not been defined: some operations may fail unexpectedly |
|
16 |
|
17 Many users may not be using features that require key manager... |
|
18 so logging the WARNING message a bit more lazily seems reasonable. |
|
19 |
|
20 Change-Id: I5ab72285c7d4bc2ec3196dd94fabf977b3a4ebaf |
|
21 Closes-bug: 1252512 |
|
22 |
|
23 diff --git a/cinder/keymgr/conf_key_mgr.py b/cinder/keymgr/conf_key_mgr.py |
|
24 index f000c44..ee4fbc3 100644 |
|
25 --- cinder-2013.2.3/cinder/keymgr/conf_key_mgr.py.~2~ 2014-05-29 11:02:58.846311952 -0700 |
|
26 +++ cinder-2013.2.3/cinder/keymgr/conf_key_mgr.py 2014-05-29 11:02:58.855843284 -0700 |
|
27 @@ -67,9 +67,6 @@ |
|
28 super(ConfKeyManager, self).__init__() |
|
29 |
|
30 self.key_id = '00000000-0000-0000-0000-000000000000' |
|
31 - if CONF.keymgr.fixed_key is None: |
|
32 - LOG.warn(_('config option keymgr.fixed_key has not been defined: ' |
|
33 - 'some operations may fail unexpectedly')) |
|
34 |
|
35 def _generate_key(self, **kwargs): |
|
36 _hex = self._generate_hex_key(**kwargs) |
|
37 @@ -78,6 +75,8 @@ |
|
38 |
|
39 def _generate_hex_key(self, **kwargs): |
|
40 if CONF.keymgr.fixed_key is None: |
|
41 + LOG.warn(_('config option keymgr.fixed_key has not been defined: ' |
|
42 + 'some operations may fail unexpectedly')) |
|
43 raise ValueError(_('keymgr.fixed_key not defined')) |
|
44 return CONF.keymgr.fixed_key |
|
45 |
|