diff options
| author | Daneyon Hansen <danehans@cisco.com> | 2015-04-14 20:02:37 +0000 |
|---|---|---|
| committer | Daneyon Hansen <danehans@cisco.com> | 2015-04-14 20:21:39 +0000 |
| commit | 3c04d60673f77dd7a8cdbe712b4ca88f31486aee (patch) | |
| tree | 8ba8f6a9ead0df914ab3881bfda937b6f74728c1 /tools/stop | |
| parent | aa5dba96da5a5e5a9ebda4afbcb428c6b5760d59 (diff) | |
| download | kolla-3c04d60673f77dd7a8cdbe712b4ca88f31486aee.tar.gz kolla-3c04d60673f77dd7a8cdbe712b4ca88f31486aee.zip | |
Adds Neutron to Start/Stop Scripts
Previously, Neutron was not included in the start/stop scripts.
This patch reads the NETWORK_MANAGER value from openstack.env
to start/stop either nova or neutron networking.
Change-Id: I85b31396c2b816b89f33206443c3d60cb4b7914b
Diffstat (limited to 'tools/stop')
| -rwxr-xr-x | tools/stop | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/tools/stop b/tools/stop index 1c0eb25c6..3a3db3d51 100755 --- a/tools/stop +++ b/tools/stop @@ -10,6 +10,8 @@ REAL_PATH=$(python -c "import os,sys;print os.path.realpath('$0')") cd "$(dirname "$REAL_PATH")/.." +NETWORK_MANAGER=$(grep -ri NETWORK_MANAGER compose/openstack.env | cut -f2 -d'=') + echo Stopping rabbitmq. docker-compose -f ./compose/rabbitmq.yml stop @@ -25,8 +27,15 @@ docker-compose -f ./compose/glance-api-registry.yml stop echo Stopping nova. docker-compose -f ./compose/nova-api-conductor-scheduler.yml stop -echo Stopping nova compute with nova networking. -docker-compose -f ./compose/nova-compute-network.yml stop +if [[ "${NETWORK_MANAGER}" == "nova" ]] ; then + echo Stopping nova compute with nova networking. + docker-compose -f ./compose/nova-compute-network.yml stop +elif [[ "${NETWORK_MANAGER}" == "neutron" ]] ; then + echo Stopping nova compute with neutron networking. + docker-compose -f ./compose/nova-compute.yml stop + docker-compose -f ./compose/neutron-server.yml up -d + docker-compose -f ./compose/neutron-agents.yml stop +fi echo Stopping heat. docker-compose -f ./compose/heat-api-engine.yml stop |