components/openstack/cinder/patches/04-launchpad-1236459.patch
branchs11u2-sru
changeset 4156 4b1def16fe9b
parent 4146 097063f324c0
child 4157 92532a6159e7
equal deleted inserted replaced
4146:097063f324c0 4156:4b1def16fe9b
     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 5c321d758c9718d7dde555316ac4fbd2f7acf424
       
     6 Author: Dan Prince <[email protected]>
       
     7 Date:   Mon Oct 7 12:41:28 2013 -0400
       
     8 
       
     9     Drop conf_key_mgr warning message!
       
    10     
       
    11     By default ConfKeyManager logs tons of WARNING message stating
       
    12     that it isn't production ready...
       
    13     
       
    14     Given that it is currently the only Cinder key manager option
       
    15     which can be used/selected I don't think repeatedly logging
       
    16     warnings is helpful. Lets just drop the warning message
       
    17     for now and when a good "production ready" cinder key manager
       
    18     implementation is implemented perhaps we can re-add a warning to
       
    19     this class (hopefully making the production ready impl the default).
       
    20     
       
    21     Change-Id: Id1fdddc20a963f9fa4749ad57f355cd83d0e14e3
       
    22     Closes-Bug: #1236459
       
    23 
       
    24 diff --git a/cinder/keymgr/conf_key_mgr.py b/cinder/keymgr/conf_key_mgr.py
       
    25 index 7b53e0c..1c9ff2d 100644
       
    26 --- a/cinder/keymgr/conf_key_mgr.py
       
    27 +++ b/cinder/keymgr/conf_key_mgr.py
       
    28 @@ -64,8 +64,6 @@ class ConfKeyManager(key_mgr.KeyManager):
       
    29      """
       
    30  
       
    31      def __init__(self):
       
    32 -        LOG.warn(_('This key manager is insecure and is not recommended for '
       
    33 -                   'production deployments'))
       
    34          super(ConfKeyManager, self).__init__()
       
    35  
       
    36          self.key_id = '00000000-0000-0000-0000-000000000000'