From 223f9e101a24e403f9f252ecdfc0362ff3183ce2 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Wed, 7 Aug 2013 07:07:08 +0100 Subject: Clarify precedence of secret_key_file If secret_key_file is set, then secret_key is ignored. Clarify this in the help strings. Change-Id: Ie10ebb7c76e274b31ab9826a81373518c9b09e0a --- openstack/common/rpc/securemessage.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'openstack') diff --git a/openstack/common/rpc/securemessage.py b/openstack/common/rpc/securemessage.py index 4ecab02..5eb9983 100644 --- a/openstack/common/rpc/securemessage.py +++ b/openstack/common/rpc/securemessage.py @@ -39,9 +39,11 @@ secure_message_opts = [ help='Whether Secure Messaging (Encryption) is enabled,' ' defaults to not enabled'), cfg.StrOpt('secret_keys_file', - help='Path to the file containing the keys'), + help='Path to the file containing the keys, takes precedence' + ' over secret_key'), cfg.MultiStrOpt('secret_key', - help='A list of keys: (ex: name:)'), + help='A list of keys: (ex: name:),' + ' ignored if secret_keys_file is set'), cfg.StrOpt('kds_endpoint', help='KDS endpoint (ex: http://kds.example.com:35357/v3)'), ] -- cgit