Merge "Fix permissions for tempest.conf"

This commit is contained in:
Jenkins 2014-02-25 13:07:19 +00:00 committed by Gerrit Code Review
commit 0df99e2d4b

View File

@ -87,11 +87,6 @@ function configure_tempest() {
local boto_instance_type="m1.tiny" local boto_instance_type="m1.tiny"
local ssh_connect_method="fixed" local ssh_connect_method="fixed"
if [[ ! -d $TEMPEST_CONFIG_DIR ]]; then
sudo mkdir -p $TEMPEST_CONFIG_DIR
fi
sudo chown $STACK_USER $TEMPEST_CONFIG_DIR
# TODO(afazekas): # TODO(afazekas):
# sudo python setup.py deploy # sudo python setup.py deploy
@ -142,8 +137,12 @@ function configure_tempest() {
# Create tempest.conf from tempest.conf.sample # Create tempest.conf from tempest.conf.sample
# copy every time, because the image UUIDS are going to change # copy every time, because the image UUIDS are going to change
sudo cp $TEMPEST_DIR/etc/tempest.conf.sample $TEMPEST_CONFIG if [[ ! -d $TEMPEST_CONFIG_DIR ]]; then
sudo chmod 644 $TEMPEST_CONFIG sudo mkdir -p $TEMPEST_CONFIG_DIR
fi
sudo chown $STACK_USER $TEMPEST_CONFIG_DIR
cp $TEMPEST_DIR/etc/tempest.conf.sample $TEMPEST_CONFIG
chmod 644 $TEMPEST_CONFIG
password=${ADMIN_PASSWORD:-secrete} password=${ADMIN_PASSWORD:-secrete}