Merge "Remove legacy paste config and nova.conf"

This commit is contained in:
Jenkins 2012-02-24 00:37:18 +00:00 committed by Gerrit Code Review
commit bb64f2d644

View File

@ -817,6 +817,9 @@ if is_service_enabled n-api; then
# one from the keystone project to launch nova. This paste config adds
# the configuration required for nova to validate keystone tokens.
# Remove legacy paste config
rm -f $NOVA_DIR/bin/nova-api-paste.ini
# First we add a some extra data to the default paste config from nova
cp $NOVA_DIR/etc/nova/api-paste.ini $NOVA_CONF
@ -1115,6 +1118,9 @@ function add_nova_flag {
echo "$1" >> $NOVA_CONF/nova.conf
}
# remove legacy nova.conf
rm -f $NOVA_DIR/bin/nova.conf
# (re)create nova.conf
rm -f $NOVA_CONF/nova.conf
add_nova_flag "--verbose"