openstack/kolla-ansible
Code Issues Proposed changes

Adds Neutron to Start/Stop Scripts

Browse Source 
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
This commit is contained in:
Daneyon Hansen 2015-04-14 20:02:37 +00:00
parent aa5dba96da
commit 3c04d60673
2 changed files with 22 additions and 4 deletions

13
tools/start

@ -28,6 +28,8 @@ fi
MY_IP=$(ip route get $(ip route | awk '$1 == "default" {print $3}') |
awk '$4 == "src" {print $5}')
NETWORK_MANAGER=$(grep -ri NETWORK_MANAGER compose/openstack.env | cut -f2 -d'=')
# Source openrc for commands
source ./openrc
@ -46,8 +48,15 @@ docker-compose -f ./compose/glance-api-registry.yml up -d
echo Starting nova.
docker-compose -f ./compose/nova-api-conductor-scheduler.yml up -d
echo Starting nova compute with nova networking.
docker-compose -f ./compose/nova-compute-network.yml up -d
if [[ "${NETWORK_MANAGER}" == "nova" ]] ; then
echo Starting nova compute with nova networking.
docker-compose -f ./compose/nova-compute-network.yml up -d
elif [[ "${NETWORK_MANAGER}" == "neutron" ]] ; then
echo Starting nova compute with neutron networking.
docker-compose -f ./compose/nova-compute.yml up -d
docker-compose -f ./compose/neutron-server.yml up -d
docker-compose -f ./compose/neutron-agents.yml up -d
fi
echo Starting heat.
docker-compose -f ./compose/heat-api-engine.yml up -d

13
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