openstack/ironic
Code Issues Proposed changes

Merge "Follow up patch of 843ce0a16160f2e2710ef0901028453cd9a0357c"

Browse Source
This commit is contained in:
Jenkins 2016-03-29 10:30:50 +00:00 committed by Gerrit Code Review
commit 998af9a303
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/lib/ironic
View File

@ -159,7 +159,7 @@ IRONIC_LIBVIRT_HOOKS_PATH=${IRONIC_LIBVIRT_HOOKS_PATH:-/etc/libvirt/hooks/}
IRONIC_AUTH_STRATEGY=${IRONIC_AUTH_STRATEGY:-keystone}
# By default, terminal SSL certificate is disabled.
IRONIC_TERMINAL_SSL=${IRONIC_TERMINAL_SSL:-False}
IRONIC_TERMINAL_SSL=$(trueorfalse False IRONIC_TERMINAL_SSL)
IRONIC_TERMINAL_CERT_DIR=${IRONIC_TERMINAL_CERT_DIR:-$IRONIC_DATA_DIR/terminal_cert/}
# get_pxe_boot_file() - Get the PXE/iPXE boot file path
@ -397,7 +397,7 @@ function configure_ironic_conductor {
# Generate the SSL certificate
openssl req \
-x509 \
-days 3650 \
-days 365 \
-newkey rsa:1024 \
-nodes \
-keyout $IRONIC_TERMINAL_CERT_DIR/certificate.pem.key \