summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Gordon <jogo@cloudscaling.com>2012-01-09 17:42:03 -0800
committerJoe Gordon <jogo@cloudscaling.com>2012-01-09 18:04:06 -0800
commit66ce7da18603a1cb0b4f500b6abb83ca264b0ccf (patch)
treec6d9cfc4e2b24f8f007a888ee503207fce364ac8
parent6fdbf6ce7fb4c5ac4282f20a68da2e8795f19817 (diff)
downloadnova-66ce7da18603a1cb0b4f500b6abb83ca264b0ccf.tar.gz
nova-66ce7da18603a1cb0b4f500b6abb83ca264b0ccf.tar.xz
nova-66ce7da18603a1cb0b4f500b6abb83ca264b0ccf.zip
fix bug 914049: private key in log
Change-Id: Id004257ae425291bb18427c5d9b03602a62da043
-rw-r--r--nova/api/ec2/apirequest.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/nova/api/ec2/apirequest.py b/nova/api/ec2/apirequest.py
index f40be6e2a..156037a87 100644
--- a/nova/api/ec2/apirequest.py
+++ b/nova/api/ec2/apirequest.py
@@ -108,7 +108,13 @@ class APIRequest(object):
response = xml.toxml()
xml.unlink()
- LOG.debug(response)
+
+ # Don't write private key to log
+ if self.action != "CreateKeyPair":
+ LOG.debug(response)
+ else:
+ LOG.debug("CreateKeyPair: Return Private Key")
+
return response
def _render_dict(self, xml, el, data):