openstack
/
nova
Code Issues Proposed changes

Fix os_CODENAME detection and repo refresh during ceph tests 

This is a partial backport of Iea6288fe6d341ee92f87a35e0b0a59fe564ab96c
a change introduced in Stein that fixed OS detection in the
nova-live-migration job while installing Ceph.

This is required after the devstack-plugin-ceph job was recently
refactored by I51c90e592070b99422e692d5e9e97083d93146e8 and in doing so
introduced various OS specific conditionals that require os_CODENAME to
be set.

NOTE(lyarwood): Conflicts due to the partial backport of
I902e459093af9b82f9033d58cffcb2a628f5ec39 in stable/queens.

Conflicts:
  nova/tests/live_migration/hooks/run_tests.sh

Change-Id: Iea6288fe6d341ee92f87a35e0b0a59fe564ab96c
(cherry picked from commit 9b2a7f9e7c)
(cherry picked from commit 7207b9ee6c)
This commit is contained in:
Lee Yarwood 2020-07-06 22:17:01 +01:00
parent 47b16a3897
commit 97cc4783aa
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nova/tests/live_migration/hooks/run_tests.sh
View File

@ -53,6 +53,7 @@ if [ "$GRENADE_OLD_BRANCH" ]; then
echo '2. test with Ceph is skipped due to bug 1813216' echo '2. test with Ceph is skipped due to bug 1813216'
else else
echo '3. test with Ceph for root + ephemeral disks' echo '3. test with Ceph for root + ephemeral disks'
GetOSVersion
prepare_ceph prepare_ceph
GLANCE_API_CONF=${GLANCE_API_CONF:-/etc/glance/glance-api.conf} GLANCE_API_CONF=${GLANCE_API_CONF:-/etc/glance/glance-api.conf}
configure_and_start_glance configure_and_start_glance