diff --git a/files/glance-api.conf b/files/glance-api.conf index 0358a7a..3499ff7 100644 --- a/files/glance-api.conf +++ b/files/glance-api.conf @@ -27,7 +27,7 @@ registry_port = 9191 log_file = %DEST%/glance/api.log # Send logs to syslog (/dev/log) instead of to file specified by `log_file` -use_syslog = False +use_syslog = %SYSLOG% # ============ Notification System Options ===================== diff --git a/files/glance-registry.conf b/files/glance-registry.conf index c3ca9a7..351b09f 100644 --- a/files/glance-registry.conf +++ b/files/glance-registry.conf @@ -19,7 +19,7 @@ log_file = %DEST%/glance/registry.log filesystem_store_datadir = %DEST%/glance/images # Send logs to syslog (/dev/log) instead of to file specified by `log_file` -use_syslog = False +use_syslog = %SYSLOG% # SQLAlchemy connection string for the reference implementation # registry server. Any valid SQLAlchemy connection string is fine. diff --git a/stack.sh b/stack.sh index 628ce54..02267d2 100755 --- a/stack.sh +++ b/stack.sh @@ -78,6 +78,9 @@ source ./stackrc # Destination path for installation ``DEST`` DEST=${DEST:-/opt/stack} +# Configure services to syslog instead of writing to individual log files +SYSLOG=${SYSLOG:-False} + # OpenStack is designed to be run as a regular user (Dashboard will fail to run # as root, since apache refused to startup serve content from root user). If # stack.sh is run as root, it automatically creates a stack user with @@ -460,11 +463,13 @@ if [[ "$ENABLED_SERVICES" =~ "g-reg" ]]; then sudo sed -e "s,%SQL_CONN%,$BASE_SQL_CONN/glance,g" -i $GLANCE_CONF sudo sed -e "s,%SERVICE_TOKEN%,$SERVICE_TOKEN,g" -i $GLANCE_CONF sudo sed -e "s,%DEST%,$DEST,g" -i $GLANCE_CONF + sudo sed -e "s,%SYSLOG%,$SYSLOG,g" -i $GLANCE_CONF GLANCE_API_CONF=$GLANCE_DIR/etc/glance-api.conf cp $FILES/glance-api.conf $GLANCE_API_CONF sudo sed -e "s,%DEST%,$DEST,g" -i $GLANCE_API_CONF sudo sed -e "s,%SERVICE_TOKEN%,$SERVICE_TOKEN,g" -i $GLANCE_API_CONF + sudo sed -e "s,%SYSLOG%,$SYSLOG,g" -i $GLANCE_API_CONF fi # Nova @@ -579,6 +584,9 @@ fi if [ -n "$MULTI_HOST" ]; then add_nova_flag "--multi_host=$MULTI_HOST" fi +if [ "$SYSLOG" != "False" ]; then + add_nova_flag "--use_syslog=1" +fi # Nova Database # ~~~~~~~~~~~~~