openstack/ironic
Code Issues Proposed changes

Don't use multicell setup for ironic & increase timeout

Browse Source 
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
This commit is contained in:
Vladyslav Drok 2017-07-26 17:57:44 +03:00 committed by John L. Villalovos
parent 338fdb94fc
commit 8302a364b1
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/settings
View File

@ -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"

3
devstack/upgrade/settings
View File

@ -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"

7
devstack/upgrade/upgrade.sh
View File

@ -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