From: Dan Prince Date: Tue, 10 Dec 2013 19:51:32 +0000 (-0500) Subject: Lazy log the fixed_key warnings X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=3badd1ffbe8796d27b924f882ed05b8d3f4f0f11;p=openstack-build%2Fcinder-build.git Lazy log the fixed_key warnings Cinder currently spews quite a bit of WARNINGs like this with the default settings: WARNING cinder.keymgr.conf_key_mgr [-] config option keymgr.fixed_key has not been defined: some operations may fail unexpectedly Many users may not be using features that require key manager... so logging the WARNING message a bit more lazily seems reasonable. Change-Id: I5ab72285c7d4bc2ec3196dd94fabf977b3a4ebaf Closes-bug: 1252512 --- diff --git a/cinder/keymgr/conf_key_mgr.py b/cinder/keymgr/conf_key_mgr.py index f000c441b..ee4fbc3f3 100644 --- a/cinder/keymgr/conf_key_mgr.py +++ b/cinder/keymgr/conf_key_mgr.py @@ -68,9 +68,6 @@ class ConfKeyManager(key_mgr.KeyManager): super(ConfKeyManager, self).__init__() self.key_id = '00000000-0000-0000-0000-000000000000' - if CONF.keymgr.fixed_key is None: - LOG.warn(_('config option keymgr.fixed_key has not been defined: ' - 'some operations may fail unexpectedly')) def _generate_key(self, **kwargs): _hex = self._generate_hex_key(**kwargs) @@ -79,6 +76,8 @@ class ConfKeyManager(key_mgr.KeyManager): def _generate_hex_key(self, **kwargs): if CONF.keymgr.fixed_key is None: + LOG.warn(_('config option keymgr.fixed_key has not been defined: ' + 'some operations may fail unexpectedly')) raise ValueError(_('keymgr.fixed_key not defined')) return CONF.keymgr.fixed_key