diff options
| author | Joe Gordon <jogo@cloudscaling.com> | 2012-01-09 17:42:03 -0800 |
|---|---|---|
| committer | Joe Gordon <jogo@cloudscaling.com> | 2012-01-09 19:55:41 -0800 |
| commit | 8c48fa52dfa0355d6b67a224eedd2d5061181039 (patch) | |
| tree | 4306204ccb13f9f23a8a2c634579a33d9d8f8a24 | |
| parent | e16db22d266d7c7e6a8809456d9629aed45e3799 (diff) | |
| download | nova-8c48fa52dfa0355d6b67a224eedd2d5061181039.tar.gz | |
Cherry-Pick: fix bug 914049: private key in log
Change-Id: If9964b8f790077ee9edc88f42ff22e15b31fa540
| -rw-r--r-- | nova/api/ec2/apirequest.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/nova/api/ec2/apirequest.py b/nova/api/ec2/apirequest.py index 9a3e559257..803413898c 100644 --- a/nova/api/ec2/apirequest.py +++ b/nova/api/ec2/apirequest.py @@ -96,7 +96,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): |