diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2013-08-07 07:07:08 +0100 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2013-08-07 07:19:49 +0100 |
| commit | 223f9e101a24e403f9f252ecdfc0362ff3183ce2 (patch) | |
| tree | 68a2ac1a23abd953aece680695eddebe1a8e4c3d /openstack | |
| parent | 56f0cf134176a380cbc236b1cc8cff63728d5ad0 (diff) | |
| download | oslo-223f9e101a24e403f9f252ecdfc0362ff3183ce2.tar.gz oslo-223f9e101a24e403f9f252ecdfc0362ff3183ce2.tar.xz oslo-223f9e101a24e403f9f252ecdfc0362ff3183ce2.zip | |
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
Diffstat (limited to 'openstack')
| -rw-r--r-- | openstack/common/rpc/securemessage.py | 6 |
1 files changed, 4 insertions, 2 deletions
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:<base64 encoded key>)'), + help='A list of keys: (ex: name:<base64 encoded key>),' + ' ignored if secret_keys_file is set'), cfg.StrOpt('kds_endpoint', help='KDS endpoint (ex: http://kds.example.com:35357/v3)'), ] |