Merge "Use --log-config with keystone."

Jenkins · openstack-gerrit · commit 7966a5356db8 · 2012-01-04T19:36:27.000Z
diff --git a/stack.sh b/stack.sh
@@ -1162,11 +1162,9 @@ if [[ "$ENABLED_SERVICES" =~ "key" ]]; then
     if [ "$SYSLOG" != "False" ]; then
         sed -i -e '/^handlers=devel$/s/=devel/=production/' \
             $KEYSTONE_DIR/etc/logging.cnf
-        sed -i -e "
-            /^log_file/s/log_file/\#log_file/; \
-            /^log_config/d;/^\[DEFAULT\]/a\
-            log_config=$KEYSTONE_DIR/etc/logging.cnf" \
+        sed -i -e "/^log_file/s/log_file/\#log_file/" \
             $KEYSTONE_DIR/etc/keystone.conf
+        KEYSTONE_LOG_CONFIG="--log-config $KEYSTONE_DIR/etc/logging.cnf"
     fi
 fi
 
@@ -1219,7 +1217,7 @@ fi
 
 # launch the keystone and wait for it to answer before continuing
 if [[ "$ENABLED_SERVICES" =~ "key" ]]; then
-    screen_it key "cd $KEYSTONE_DIR && $KEYSTONE_DIR/bin/keystone --config-file $KEYSTONE_CONF -d"
+    screen_it key "cd $KEYSTONE_DIR && $KEYSTONE_DIR/bin/keystone --config-file $KEYSTONE_CONF $KEYSTONE_LOG_CONFIG -d"
     echo "Waiting for keystone to start..."
     if ! timeout $SERVICE_TIMEOUT sh -c "while ! wget -q -O- http://127.0.0.1:5000; do sleep 1; done"; then
       echo "keystone did not start"
