diff options
| author | Josh Kearney <josh@jk0.org> | 2011-03-23 23:18:32 -0500 |
|---|---|---|
| committer | Josh Kearney <josh@jk0.org> | 2011-03-23 23:18:32 -0500 |
| commit | 97ac70c45b78dcffeeb53f7408c42e3e240ca6d7 (patch) | |
| tree | 892a5b4a47ecdd43e4dcbcdc92cf8d81b22ded78 | |
| parent | 2f6aff324009be63ad2368295d5af01dcd040c4d (diff) | |
| parent | e9d02084b69e4eb5be1c88b014a59f63ef4a9046 (diff) | |
| download | nova-97ac70c45b78dcffeeb53f7408c42e3e240ca6d7.tar.gz nova-97ac70c45b78dcffeeb53f7408c42e3e240ca6d7.tar.xz nova-97ac70c45b78dcffeeb53f7408c42e3e240ca6d7.zip | |
Merged trunk
| -rw-r--r-- | nova/crypto.py | 3 | ||||
| -rw-r--r-- | nova/db/api.py | 2 |
2 files changed, 3 insertions, 2 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()) diff --git a/nova/db/api.py b/nova/db/api.py index add5bd83e..afc1bff2f 100644 --- a/nova/db/api.py +++ b/nova/db/api.py @@ -214,7 +214,7 @@ def certificate_update(context, certificate_id, values): Raises NotFound if service does not exist. """ - return IMPL.service_update(context, certificate_id, values) + return IMPL.certificate_update(context, certificate_id, values) ################### |