summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorDean Troyer <dtroyer@gmail.com>2012-01-25 12:19:45 -0600
committerDean Troyer <dtroyer@gmail.com>2012-01-25 12:43:28 -0600
commitf63a54841f668cb92cd32bed27e20c9726b49f58 (patch)
tree1adb1b60b8c8dd95c2edf397ec4f451eba0698f5 /nova
parentfcf73f90c37c53fc7743134f6088b3efca52485e (diff)
downloadnova-f63a54841f668cb92cd32bed27e20c9726b49f58.tar.gz
nova-f63a54841f668cb92cd32bed27e20c9726b49f58.tar.xz
nova-f63a54841f668cb92cd32bed27e20c9726b49f58.zip
Fix bug 921715 - 'nova x509-create-cert' fails
The 'CN' value passed to openssl was too long, shorten it. Change-Id: I9da6510bf23a8ad33b08f3373f09e0c5287fe051
Diffstat (limited to 'nova')
-rw-r--r--nova/crypto.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/nova/crypto.py b/nova/crypto.py
index c0bb750f5..5dd380fb6 100644
--- a/nova/crypto.py
+++ b/nova/crypto.py
@@ -61,13 +61,13 @@ flags.DEFINE_string('ca_path', '$state_path/CA',
flags.DEFINE_boolean('use_project_ca', False,
_('Should we use a CA for each project?'))
flags.DEFINE_string('user_cert_subject',
- '/C=US/ST=California/L=MountainView/O=AnsoLabs/'
- 'OU=NovaDev/CN=%s-%s-%s',
+ '/C=US/ST=California/O=OpenStack/'
+ 'OU=NovaDev/CN=%.16s-%.16s-%s',
_('Subject for certificate for users, '
'%s for project, user, timestamp'))
flags.DEFINE_string('project_cert_subject',
- '/C=US/ST=California/L=MountainView/O=AnsoLabs/'
- 'OU=NovaDev/CN=project-ca-%s-%s',
+ '/C=US/ST=California/O=OpenStack/'
+ 'OU=NovaDev/CN=project-ca-%.16s-%s',
_('Subject for certificate for projects, '
'%s for project, timestamp'))