diff options
| author | Eric Windisch <eric@cloudscaling.com> | 2011-03-09 16:44:48 -0500 |
|---|---|---|
| committer | Eric Windisch <eric@cloudscaling.com> | 2011-03-09 16:44:48 -0500 |
| commit | e8554da80ac916f168461cb48078488700081c02 (patch) | |
| tree | f406af60649ef9ff60712ac353ffe238dd70366d /nova/crypto.py | |
| parent | fc9840bae6200c8f89fb8a3ba0ab45663c872b3c (diff) | |
| download | nova-e8554da80ac916f168461cb48078488700081c02.tar.gz nova-e8554da80ac916f168461cb48078488700081c02.tar.xz nova-e8554da80ac916f168461cb48078488700081c02.zip | |
execvp: cleanup.
Diffstat (limited to 'nova/crypto.py')
| -rw-r--r-- | nova/crypto.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/crypto.py b/nova/crypto.py index 717ea0041..2a8d4abca 100644 --- a/nova/crypto.py +++ b/nova/crypto.py @@ -105,7 +105,7 @@ def generate_key_pair(bits=1024): tmpdir = tempfile.mkdtemp() keyfile = os.path.join(tmpdir, 'temp') - utils.execute('ssh-keygen', '-q', '-b', '%d' % bits, '-N', '', + utils.execute('ssh-keygen', '-q', '-b', bits, '-N', '', '-f', keyfile) (out, err) = utils.execute('ssh-keygen', '-q', '-l', '-f', '%s.pub' % (keyfile)) @@ -147,9 +147,9 @@ def revoke_cert(project_id, file_name): os.chdir(ca_folder(project_id)) # NOTE(vish): potential race condition here utils.execute('openssl', 'ca', '-config', './openssl.cnf', '-revoke', - '%s' % file_name) + file_name) utils.execute('openssl', 'ca', '-gencrl', '-config', './openssl.cnf', - '-out', '%s' % FLAGS.crl_file) + '-out', FLAGS.crl_file) os.chdir(start) |