openstack/devstack
Code Issues Proposed changes

Merge "Switching Sahara to https in case of USE_SSL=True"

Browse Source
This commit is contained in:
Jenkins
2015-04-17 15:49:22 +00:00
committed by Gerrit Code Review
parent 4c354b9f07 5ccbd0ae0f
commit 87bb99d9e4
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/sahara
View File

@@ -33,6 +33,9 @@ SAHARA_DIR=$DEST/sahara
SAHARA_CONF_DIR=${SAHARA_CONF_DIR:-/etc/sahara} SAHARA_CONF_DIR=${SAHARA_CONF_DIR:-/etc/sahara}
SAHARA_CONF_FILE=${SAHARA_CONF_DIR}/sahara.conf SAHARA_CONF_FILE=${SAHARA_CONF_DIR}/sahara.conf
if is_ssl_enabled_service "sahara"; then
SAHARA_SERVICE_PROTOCOL="https"
fi
SAHARA_SERVICE_HOST=${SAHARA_SERVICE_HOST:-$SERVICE_HOST} SAHARA_SERVICE_HOST=${SAHARA_SERVICE_HOST:-$SERVICE_HOST}
SAHARA_SERVICE_PORT=${SAHARA_SERVICE_PORT:-8386} SAHARA_SERVICE_PORT=${SAHARA_SERVICE_PORT:-8386}
SAHARA_SERVICE_PROTOCOL=${SAHARA_SERVICE_PROTOCOL:-$SERVICE_PROTOCOL} SAHARA_SERVICE_PROTOCOL=${SAHARA_SERVICE_PROTOCOL:-$SERVICE_PROTOCOL}
@@ -165,6 +168,14 @@ function configure_sahara {
iniset $SAHARA_CONF_FILE keystone ca_file $SSL_BUNDLE_FILE iniset $SAHARA_CONF_FILE keystone ca_file $SSL_BUNDLE_FILE
fi fi
# Register SSL certificates if provided
if is_ssl_enabled_service sahara; then
ensure_certificates SAHARA
iniset $SAHARA_CONF_FILE ssl cert_file "$SAHARA_SSL_CERT"
iniset $SAHARA_CONF_FILE ssl key_file "$SAHARA_SSL_KEY"
fi
iniset $SAHARA_CONF_FILE DEFAULT use_syslog $SYSLOG iniset $SAHARA_CONF_FILE DEFAULT use_syslog $SYSLOG
# Format logging # Format logging

2
stack.sh
View File

@@ -505,7 +505,7 @@ source $TOP_DIR/lib/rpc_backend
check_rpc_backend check_rpc_backend
# Service to enable with SSL if ``USE_SSL`` is True # Service to enable with SSL if ``USE_SSL`` is True
SSL_ENABLED_SERVICES="key,nova,cinder,glance,s-proxy,neutron" SSL_ENABLED_SERVICES="key,nova,cinder,glance,s-proxy,neutron,sahara"
if is_service_enabled tls-proxy && [ "$USE_SSL" == "True" ]; then if is_service_enabled tls-proxy && [ "$USE_SSL" == "True" ]; then
die $LINENO "tls-proxy and SSL are mutually exclusive" die $LINENO "tls-proxy and SSL are mutually exclusive"