summaryrefslogtreecommitdiff
path: root/nova/crypto.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-04-29 19:05:38 +0000
committerGerrit Code Review <review@openstack.org>2015-04-29 19:05:38 +0000
commite61dad455da99125a9e29e96beb1741258096abb (patch)
treee38e3e649ea14f5dc5f42ff274098fee841c6f49 /nova/crypto.py
parent326ebe1aad6aba258d028cb7b5d49cbc7f691457 (diff)
parentf88edaa6fc80e0c38727469ca69f0016de23db18 (diff)
downloadnova-e61dad455da99125a9e29e96beb1741258096abb.tar.gz
Merge "Fixes X509 keypair creation failure"
Diffstat (limited to 'nova/crypto.py')
-rw-r--r--nova/crypto.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/crypto.py b/nova/crypto.py
index 843938d0e1..64907e0c2c 100644
--- a/nova/crypto.py
+++ b/nova/crypto.py
@@ -360,9 +360,9 @@ def generate_x509_cert(user_id, project_id, bits=2048):
return (private_key, signed_csr)
-def generate_winrm_x509_cert(user_id, project_id, bits=2048):
+def generate_winrm_x509_cert(user_id, bits=2048):
"""Generate a cert for passwordless auth for user in project."""
- subject = '/CN=%s-%s' % (project_id, user_id)
+ subject = '/CN=%s' % user_id
upn = '%s@localhost' % user_id
with utils.tempdir() as tmpdir: