openstack/ironic
Code Issues Proposed changes

Follow up patch of 843ce0a16160f2e2710ef0901028453cd9a0357c

Browse Source 
Change-Id: I622069f899cecf72da4bb1b84ff703dc235bc964
This commit is contained in:
Zhenguo Niu 2016-03-25 01:12:46 +08:00
parent 843ce0a161
commit 0f3c83e32f
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

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