summaryrefslogtreecommitdiffstats
path: root/nova/crypto.py
diff options
context:
space:
mode:
authorKei Masumoto <masumotok@nttdata.co.jp>2011-01-14 04:39:35 +0900
committerKei Masumoto <masumotok@nttdata.co.jp>2011-01-14 04:39:35 +0900
commit6bfcd0e63f247553207dcbfe2a3ad0d1403eec5a (patch)
tree936e1a9c175fba12c445f4ac17897793af3efb80 /nova/crypto.py
parentea28b3117b02bcfd26e4017e850313cf5272d354 (diff)
parentd7373358443bb64f72b65ee18e35b8d90518f011 (diff)
Fixed based on the comments from code review. Merged to trunk rev 561
Diffstat (limited to 'nova/crypto.py')
-rw-r--r--nova/crypto.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/nova/crypto.py b/nova/crypto.py
index b8405552d..a34b940f5 100644
--- a/nova/crypto.py
+++ b/nova/crypto.py
@@ -24,7 +24,6 @@ Includes root and intermediate CAs, SSH key_pairs and x509 certificates.
import base64
import gettext
import hashlib
-import logging
import os
import shutil
import struct
@@ -39,8 +38,10 @@ gettext.install('nova', unicode=1)
from nova import context
from nova import db
from nova import flags
+from nova import log as logging
+LOG = logging.getLogger("nova.crypto")
FLAGS = flags.FLAGS
flags.DEFINE_string('ca_file', 'cacert.pem', _('Filename of root CA'))
flags.DEFINE_string('key_file',
@@ -254,7 +255,7 @@ def _sign_csr(csr_text, ca_folder):
csrfile = open(inbound, "w")
csrfile.write(csr_text)
csrfile.close()
- logging.debug(_("Flags path: %s") % ca_folder)
+ LOG.debug(_("Flags path: %s"), ca_folder)
start = os.getcwd()
# Change working dir to CA
os.chdir(ca_folder)