openstack/astara
Code Issues Proposed changes

devstack: move neutron restart earlier, bump functional test appliance active timeout

Browse Source 
The gate nodes are sllooow and this seems to be timing out and
failing tests.  Also, we're seeing a failure where neutron is
unavailable until long after the Rug starts up.  This moves neutron
service restart to pre_start phase.

Change-Id: Ib417b3eae2c65eca437d054ce7e90a47e5c3c007
This commit is contained in:
Adam Gandelman 2015-10-15 12:16:19 -07:00
parent 0e2cdded30
commit d6ad277965
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
devstack/plugin.sh
View File

@ -270,6 +270,14 @@ function pre_start_akanda() {
create_akanda_nova_flavor create_akanda_nova_flavor
# Restart neutron so that `akanda.floatingip_subnet` is properly set
if [[ "$USE_SCREEN" == "True" ]]; then
screen_stop_service q-svc
else
stop_process q-svc
fi
start_neutron_service_and_check
sleep 10
} }
function start_akanda_rug() { function start_akanda_rug() {
@ -286,14 +294,6 @@ function post_start_akanda() {
neutron $auth_args net-create thenet neutron $auth_args net-create thenet
neutron $auth_args subnet-create thenet $FIXED_RANGE neutron $auth_args subnet-create thenet $FIXED_RANGE
# Restart neutron so that `akanda.floatingip_subnet` is properly set
if [[ "$USE_SCREEN" == "True" ]]; then
screen_stop_service q-svc
else
stop_process q-svc
fi
start_neutron_service_and_check
# Open all traffic on the private CIDR # Open all traffic on the private CIDR
set_demo_tenant_sec_group_private_traffic set_demo_tenant_sec_group_private_traffic
} }

2
tools/run_functional.sh
View File

@ -30,7 +30,7 @@ function find_router() {
cat <<END >$CONFIG_FILE cat <<END >$CONFIG_FILE
[functional] [functional]
appliance_active_timeout=240 appliance_active_timeout=480
os_auth_url=$OS_AUTH_URL os_auth_url=$OS_AUTH_URL
os_username=$OS_USERNAME os_username=$OS_USERNAME
os_password=$OS_PASSWORD os_password=$OS_PASSWORD