openstack/kuryr
Code Issues Proposed changes

Make the script run on RedHat-like OS

Browse Source 
A couple of slight changes to make the './devstack/plugin.sh' run on
RedHat/CentOS/Fedora machines.

Change-Id: If4141a50fc54e85b2f1eb2dec4ef25040a33c840
This commit is contained in:
Jaume Devesa 2015-12-18 15:16:39 +01:00
parent a503a82464
commit e82c253a3b
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devstack/plugin.sh
View File

@ -64,6 +64,7 @@ if is_service_enabled kuryr; then
else else
echo -n "${KURYR_CONFIG} and the default config missing. Auto generating and copying one... " echo -n "${KURYR_CONFIG} and the default config missing. Auto generating and copying one... "
cd ${KURYR_HOME} cd ${KURYR_HOME}
pip_install tox
tox -egenconfig tox -egenconfig
sudo cp ${KURYR_DEFAULT_CONFIG}.sample ${KURYR_DEFAULT_CONFIG} sudo cp ${KURYR_DEFAULT_CONFIG}.sample ${KURYR_DEFAULT_CONFIG}
sudo cp ${KURYR_DEFAULT_CONFIG} ${KURYR_CONFIG} sudo cp ${KURYR_DEFAULT_CONFIG} ${KURYR_CONFIG}
@ -79,7 +80,11 @@ if is_service_enabled kuryr; then
sudo sh install_docker.sh sudo sh install_docker.sh
sudo rm install_docker.sh sudo rm install_docker.sh
sudo killall docker # CentOS/RedHat distros don't start the services just after the package
# is installed if it is not explicitily set. So the script fails on
# them in this killall because there is nothing to kill.
# TODO(devvesa): use a `is_running service` or a more elegant approach
sudo killall docker || true
run_process docker-engine "sudo /usr/bin/docker daemon --cluster-store etcd://localhost:4001" run_process docker-engine "sudo /usr/bin/docker daemon --cluster-store etcd://localhost:4001"
run_process kuryr "sudo PYTHONPATH=$PYTHONPATH:$DEST/kuryr SERVICE_USER=admin SERVICE_PASSWORD=$SERVICE_PASSWORD SERVICE_TENANT_NAME=admin SERVICE_TOKEN=$SERVICE_TOKEN IDENTITY_URL=http://127.0.0.1:5000/v2.0 python $DEST/kuryr/scripts/run_server.py --config-file /etc/kuryr/kuryr.conf" run_process kuryr "sudo PYTHONPATH=$PYTHONPATH:$DEST/kuryr SERVICE_USER=admin SERVICE_PASSWORD=$SERVICE_PASSWORD SERVICE_TENANT_NAME=admin SERVICE_TOKEN=$SERVICE_TOKEN IDENTITY_URL=http://127.0.0.1:5000/v2.0 python $DEST/kuryr/scripts/run_server.py --config-file /etc/kuryr/kuryr.conf"
fi fi