Merge "Use sahara.conf.sample instead of old one"

This commit is contained in:
Jenkins 2014-03-21 03:56:56 +00:00 committed by Gerrit Code Review
commit 5710853b62

View File

@ -102,8 +102,7 @@ function configure_sahara {
sudo chown $STACK_USER $SAHARA_CONF_DIR sudo chown $STACK_USER $SAHARA_CONF_DIR
# Copy over sahara configuration file and configure common parameters. # Copy over sahara configuration file and configure common parameters.
# TODO(slukjanov): rename when sahara internals will be updated cp $SAHARA_DIR/etc/sahara/sahara.conf.sample $SAHARA_CONF_FILE
cp $SAHARA_DIR/etc/savanna/savanna.conf.sample $SAHARA_CONF_FILE
# Create auth cache dir # Create auth cache dir
sudo mkdir -p $SAHARA_AUTH_CACHE_DIR sudo mkdir -p $SAHARA_AUTH_CACHE_DIR