summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-01-25 22:51:23 +0000
committerGerrit Code Review <review@openstack.org>2012-01-25 22:51:23 +0000
commit07eebdfdef069945d04cf6ca1bb45a68ea32766b (patch)
tree1cace8f56404959cc07a5b629cecda9b2df8f298
parent5c51ee01e2657cd2af1edf8ce8a3b52ba5d95374 (diff)
parentfa10e7ad5b3f6ab5de5b7b187da7a8bf05a263d5 (diff)
Merge "Do not output admin_password in debug logs"
-rw-r--r--nova/rpc/common.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/nova/rpc/common.py b/nova/rpc/common.py
index 201bc8acb..25f287251 100644
--- a/nova/rpc/common.py
+++ b/nova/rpc/common.py
@@ -108,7 +108,10 @@ class Connection(object):
def _safe_log(log_func, msg, msg_data):
"""Sanitizes the msg_data field before logging."""
- SANITIZE = {'set_admin_password': ('new_pass',)}
+ SANITIZE = {
+ 'set_admin_password': ('new_pass',),
+ 'run_instance': ('admin_password',),
+ }
method = msg_data['method']
if method in SANITIZE:
msg_data = copy.deepcopy(msg_data)