openstack/kuryr
Code Issues Proposed changes

plugin.sh stops docker service rather than kill docker daemon.

Browse Source 
* Docker services is now gracefully shut down
* Renames docker service back to docker-engine

Change-Id: I17c42ecadfd9c418ab8eb2f94c2283f5dd5e9afc
This commit is contained in:
Frederick F. Kautz IV 2016-02-20 17:01:42 -08:00
parent 677a906a1b
commit 7f0304b8e8
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/local.conf.sample
View File

@ -12,7 +12,7 @@ ADMIN_PASSWORD=pass
enable_plugin kuryr https://git.openstack.org/openstack/kuryr enable_plugin kuryr https://git.openstack.org/openstack/kuryr
enable_service kuryr enable_service kuryr
enable_service etcd-server enable_service etcd-server
enable_service docker enable_service docker-engine
# Use Neutron instead of nova-network # Use Neutron instead of nova-network
disable_service n-net disable_service n-net

6
devstack/plugin.sh
View File

@ -91,11 +91,7 @@ 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
# CentOS/RedHat distros don't start the services just after the package sudo service docker stop
# 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 -H tcp://0.0.0.0:2375 --cluster-store etcd://localhost:4001" run_process docker-engine "sudo /usr/bin/docker daemon -H tcp://0.0.0.0:2375 --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"