From 3c04d60673f77dd7a8cdbe712b4ca88f31486aee Mon Sep 17 00:00:00 2001 From: Daneyon Hansen Date: Tue, 14 Apr 2015 20:02:37 +0000 Subject: 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 --- tools/stop | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'tools/stop') 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 -- cgit v1.2.3