diff options
| author | Salvatore Orlando <salvatore.orlando@eu.citrix.com> | 2011-03-24 11:06:17 +0000 |
|---|---|---|
| committer | Salvatore Orlando <salvatore.orlando@eu.citrix.com> | 2011-03-24 11:06:17 +0000 |
| commit | 8728108512052d24d363d149307fafa993e323a5 (patch) | |
| tree | 5cc53e8dfc54b108c8721063e191aa7f69adf528 /nova/crypto.py | |
| parent | 90085fdc93a9e466b90048069ef5d446ca7d3ddf (diff) | |
| parent | 2434138bbc73a8dbaee44c66cb7bed9f1fa40b2b (diff) | |
| download | nova-8728108512052d24d363d149307fafa993e323a5.tar.gz nova-8728108512052d24d363d149307fafa993e323a5.tar.xz nova-8728108512052d24d363d149307fafa993e323a5.zip | |
merge trunk
Diffstat (limited to 'nova/crypto.py')
| -rw-r--r-- | nova/crypto.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/crypto.py b/nova/crypto.py index 2a8d4abca..b112e5b92 100644 --- a/nova/crypto.py +++ b/nova/crypto.py @@ -26,6 +26,7 @@ import gettext import hashlib import os import shutil +import string import struct import tempfile import time @@ -267,7 +268,7 @@ def _sign_csr(csr_text, ca_folder): './openssl.cnf', '-infiles', inbound) out, _err = utils.execute('openssl', 'x509', '-in', outbound, '-serial', '-noout') - serial = out.rpartition("=")[2] + serial = string.strip(out.rpartition("=")[2]) os.chdir(start) with open(outbound, "r") as crtfile: return (serial, crtfile.read()) |