From 8302a364b1b8f67112d870b1554205af2dff403d Mon Sep 17 00:00:00 2001 From: Vladyslav Drok Date: Wed, 26 Jul 2017 17:57:44 +0300 Subject: [PATCH] Don't use multicell setup for ironic & increase timeout The reschedule, that happens in multinode jobs quite often, does not work with multicell setup. Don't use multicell setup for our Ironic jobs. Increase the http timeout for clients in order to work around neutron issue. Change-Id: I2bbdac5cd431e72517cb1c72bb925660ec8e868b --- devstack/settings | 4 ++++ devstack/upgrade/settings | 3 +++ devstack/upgrade/upgrade.sh | 7 ++++++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/devstack/settings b/devstack/settings index 82d273e5e2..4391b56e96 100644 --- a/devstack/settings +++ b/devstack/settings @@ -8,3 +8,7 @@ local_mtu=$(ip link show | sed -ne 's/.*mtu \([0-9]\+\).*/\1/p' | sort -n | head # 50 bytes is overhead for vxlan (which is greater than GRE # allowing us to use either overlay option with this MTU. PUBLIC_BRIDGE_MTU=$((local_mtu - 50)) + +# NOTE(vdrok): we don't use the multicell setup because it won't let the +# reschedules happen. We hit them quite often in multinode job. +CELLSV2_SETUP="singleconductor" diff --git a/devstack/upgrade/settings b/devstack/upgrade/settings index b1f5c60ee9..3b4383cb4c 100644 --- a/devstack/upgrade/settings +++ b/devstack/upgrade/settings @@ -28,3 +28,6 @@ if [[ "${HOST_TOPOLOGY}" == "multinode" ]]; then # Remove 'nova' from the list of projects to upgrade UPGRADE_PROJECTS=$(echo $UPGRADE_PROJECTS | sed -e 's/\s*nova//g' ) fi + +# NOTE(vdrok): Do not setup multicell during upgrade +export CELLSV2_SETUP="singleconductor" diff --git a/devstack/upgrade/upgrade.sh b/devstack/upgrade/upgrade.sh index 03357eb677..ba1e3f6261 100755 --- a/devstack/upgrade/upgrade.sh +++ b/devstack/upgrade/upgrade.sh @@ -44,6 +44,11 @@ source $TARGET_DEVSTACK_DIR/lib/neutron-legacy source $TARGET_DEVSTACK_DIR/lib/apache source $TARGET_DEVSTACK_DIR/lib/keystone +# TODO(vdrok): remove this when https://bugs.launchpad.net/neutron/+bug/1707160 +# fixed +source $TARGET_DEVSTACK_DIR/lib/tempest +iniset $TEMPEST_CONFIG service-clients http_timeout 120 + source $TOP_DIR/openrc admin admin # Keep track of the DevStack directory @@ -106,7 +111,7 @@ start_ironic # may cause nova-compute failure due to LP1537076 stop_nova_compute || true wait_for_keystone -start_nova_compute nomulticell +start_nova_compute if [[ -n "$ensure_stopped" ]]; then ensure_services_stopped $ensure_stopped