openstack/devstack
Code Issues Proposed changes

Neutron: create network resources when agents are started

Browse Source 
Creating network resources before the agents start with the ml2
plugin might result in bnding failures for some resources such as
DHCP ports because the resources are created before the agents
report to the server.

This patch should ensure all agents have started and reported
their state to the server before creating network resources.

Change-Id: Ifafb73bd3c5409a555a573ad9a94b96d79061c38
Related-Bug: #1253896
This commit is contained in:
Salvatore Orlando 2013-12-22 07:59:37 -08:00
parent bc22aeb4bc
commit 6fbb28d021
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
stack.sh
View File

@ -1104,10 +1104,7 @@ fi
if is_service_enabled q-svc; then if is_service_enabled q-svc; then
echo_summary "Starting Neutron" echo_summary "Starting Neutron"
start_neutron_service_and_check start_neutron_service_and_check
create_neutron_initial_network
setup_neutron_debug
elif is_service_enabled $DATABASE_BACKENDS && is_service_enabled n-net; then elif is_service_enabled $DATABASE_BACKENDS && is_service_enabled n-net; then
NM_CONF=${NOVA_CONF} NM_CONF=${NOVA_CONF}
if is_service_enabled n-cell; then if is_service_enabled n-cell; then
@ -1127,6 +1124,12 @@ fi
if is_service_enabled neutron; then if is_service_enabled neutron; then
start_neutron_agents start_neutron_agents
fi fi
# Once neutron agents are started setup initial network elements
if is_service_enabled q-svc; then
echo_summary "Creating initial neutron network elements"
create_neutron_initial_network
setup_neutron_debug
fi
if is_service_enabled nova; then if is_service_enabled nova; then
echo_summary "Starting Nova" echo_summary "Starting Nova"
start_nova start_nova