josch/devstack_custom
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #104 from jeblair/master

Browse source 
Add syslog option
This commit is contained in:
Jesse Andrews 2011-10-27 12:42:37 -07:00
commit 4d53b1ab11
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
files/glance-api.conf
View file

@ -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 =====================

2
files/glance-registry.conf
View file

@ -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.

8
stack.sh
View file

@ -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
@ -478,11 +481,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
@ -627,6 +632,9 @@ if [ -n "$MULTI_HOST" ]; then
add_nova_flag "--multi_host=$MULTI_HOST"
add_nova_flag "--send_arp_for_ha=1"
fi
if [ "$SYSLOG" != "False" ]; then
add_nova_flag "--use_syslog=1"
fi
# Nova Database
# ~~~~~~~~~~~~~