summaryrefslogtreecommitdiffstats
path: root/openstack
diff options
context:
space:
mode:
Diffstat (limited to 'openstack')
-rw-r--r--openstack/common/rpc/securemessage.py6
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)'),
]