openstack/devstack
Code Issues Proposed changes

Merge "Move certificate setup earlier in deployment"

Browse Source
This commit is contained in:
Jenkins 2016-11-17 20:48:09 +00:00 committed by Gerrit Code Review
commit 3c251b8023
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/tls
View File

@ -201,7 +201,6 @@ subjectAltName = \$ENV::SUBJECT_ALT_NAME
# Create root and intermediate CAs # Create root and intermediate CAs
# init_CA # init_CA
function init_CA { function init_CA {
fix_system_ca_bundle_path
# Ensure CAs are built # Ensure CAs are built
make_root_CA $ROOT_CA_DIR make_root_CA $ROOT_CA_DIR
make_int_CA $INT_CA_DIR $ROOT_CA_DIR make_int_CA $INT_CA_DIR $ROOT_CA_DIR

14
stack.sh
View File

@ -809,6 +809,13 @@ if is_service_enabled cinder nova; then
install_os_brick install_os_brick
fi fi
# Setup TLS certs
if is_service_enabled tls-proxy || [ "$USE_SSL" == "True" ]; then
configure_CA
init_CA
init_cert
fi
# Install middleware # Install middleware
install_keystonemiddleware install_keystonemiddleware
@ -881,14 +888,9 @@ if is_service_enabled heat; then
fi fi
if is_service_enabled tls-proxy || [ "$USE_SSL" == "True" ]; then if is_service_enabled tls-proxy || [ "$USE_SSL" == "True" ]; then
configure_CA fix_system_ca_bundle_path
init_CA
init_cert
# Add name to ``/etc/hosts``.
# Don't be naive and add to existing line!
fi fi
# Extras Install # Extras Install
# -------------- # --------------

1
tools/make_cert.sh
View File

@ -45,6 +45,7 @@ DEVSTACK_CERT=$DATA_DIR/$DEVSTACK_CERT_NAME.pem
# Make sure the CA is set up # Make sure the CA is set up
configure_CA configure_CA
fix_system_ca_bundle_path
init_CA init_CA
# Create the server cert # Create the server cert