openstack/devstack
Code Issues Proposed changes

Merge "Remove temporary fix for keystone.conf file."

Browse Source
This commit is contained in:
Jenkins 2012-04-11 17:06:20 +00:00 committed by Gerrit Code Review
commit c1a37a5d46
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
stack.sh
View File

@ -1547,14 +1547,6 @@ if is_service_enabled key; then
fi fi
if [[ "$KEYSTONE_CONF_DIR" != "$KEYSTONE_DIR/etc" ]]; then if [[ "$KEYSTONE_CONF_DIR" != "$KEYSTONE_DIR/etc" ]]; then
# FIXME(dtroyer): etc/keystone.conf causes trouble if the config files
# are located anywhere else (say, /etc/keystone).
# LP 966670 fixes this in keystone, we fix it
# here until the bug fix is committed.
if [[ -r $KEYSTONE_DIR/etc/keystone.conf ]]; then
# Get the sample config file out of the way
mv $KEYSTONE_DIR/etc/keystone.conf $KEYSTONE_DIR/etc/keystone.conf.sample
fi
cp -p $KEYSTONE_DIR/etc/keystone.conf.sample $KEYSTONE_CONF cp -p $KEYSTONE_DIR/etc/keystone.conf.sample $KEYSTONE_CONF
cp -p $KEYSTONE_DIR/etc/policy.json $KEYSTONE_CONF_DIR cp -p $KEYSTONE_DIR/etc/policy.json $KEYSTONE_CONF_DIR
fi fi