diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-01-10 03:22:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-01-10 03:22:58 +0000 |
| commit | ef6058a44649715d5215958475c444ad811fe491 (patch) | |
| tree | 7fe1c1adb7988e9e49eb0e4a79ca12baf403045a /nova/api | |
| parent | c33bd50a79571e64267bd8d5762bd94f7ef5ca81 (diff) | |
| parent | 66ce7da18603a1cb0b4f500b6abb83ca264b0ccf (diff) | |
Merge "fix bug 914049: private key in log"
Diffstat (limited to 'nova/api')
| -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 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): |