From 0f3c83e32f7af4fa1f3d8a35f3de758890c06d9c Mon Sep 17 00:00:00 2001
From: Zhenguo Niu <Niu.ZGlinux@gmail.com>
Date: Fri, 25 Mar 2016 01:12:46 +0800
Subject: [PATCH] Follow up patch of 843ce0a16160f2e2710ef0901028453cd9a0357c
Change-Id: I622069f899cecf72da4bb1b84ff703dc235bc964
---
devstack/lib/ironic | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/devstack/lib/ironic b/devstack/lib/ironic
index 227784e78a..a578ad74b5 100644
--- a/devstack/lib/ironic
+++ b/devstack/lib/ironic
@@ -158,7 +158,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
@@ -396,7 +396,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 \