openstack/ironic
Code Issues Proposed changes

Fix grenade tests

Browse Source 
Downgrade ipxe-qemu during grenade job
Temporary workaround while we find the problem with the
newer ipxe-qemu package.
Task: #26553

Switch grenade job to wsgi
Now that grenade is using Rocky as its base we
can switch to WSGI for ir-api. Also now required
for CI as IRONIC_USE_WSGI was getting flipflopped
from False -> True -> False during the grenade job.
Task: #26594

Disable the ironic-api redirect as it doesn't work with wsgi
Task: #26595

Increase the keystone token timeout, for grenade jobs only
Task: #26596

Story: #2003808
Change-Id: Icc380e6e5128f15f90b3a86cb773e7bb8d60d076
Depends-On: Ib7d68d1360e3cdbfdc2ff185a9760461e75ac8c4
This commit is contained in:
Derek Higgins 2017-07-25 16:13:22 +01:00 committed by Dmitry Tantsur
parent 2106385999
commit 9b9f31cc69
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devstack/upgrade/settings
View File

@ -29,5 +29,9 @@ fi
# NOTE(vdrok): Do not setup multicell during upgrade
export CELLSV2_SETUP="singleconductor"
# NOTE(vsaienko) Do not run ironic-api under wsgi after upgrade
export IRONIC_USE_MOD_WSGI=False
# TODO(derekh): investigate if this is actually needed
devstack_localrc base """
[[post-config|\$KEYSTONE_CONF]]
[token]
expiration=10800"""

7
devstack/upgrade/upgrade.sh
View File

@ -36,6 +36,10 @@ set -o errexit
# Upgrade Ironic
# ============
# Workaroud to remove the use of ipxe-qemu from xenial-updates/queens/main
# https://storyboard.openstack.org/#!/story/2003808
sudo apt-get -y --allow-downgrades install ipxe-qemu=1.0.0+git-20150424.a25a16d-1ubuntu1.2
# Duplicate some setup bits from target DevStack
source $TARGET_DEVSTACK_DIR/stackrc
source $TARGET_DEVSTACK_DIR/lib/tls
@ -89,7 +93,8 @@ ensure_stopped=''
# According to Ironic upgrade procedure, we shouldn't have upgraded (new) ironic-api and not upgraded (old)
# ironic-conductor. By setting redirect of API requests from primary node to subnode during upgrade
# allow to satisfy ironic upgrade requirements.
if [[ "$HOST_TOPOLOGY_ROLE" == 'primary' ]]; then
# FIXME: We need a wsgi alternative to this ASAP
if [[ "$HOST_TOPOLOGY_ROLE" == 'primary-disabled' ]]; then
disable_service ir-api
ensure_stopped+='ironic-api'
ironic_apache_conf=$(apache_site_config_for ironic-api-redirect)