diff options
Diffstat (limited to 'nova/tests/live_migration/hooks')
| -rwxr-xr-x | nova/tests/live_migration/hooks/ceph.sh | 1 | ||||
| -rwxr-xr-x | nova/tests/live_migration/hooks/run_tests.sh | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/nova/tests/live_migration/hooks/ceph.sh b/nova/tests/live_migration/hooks/ceph.sh index 4fbe3f2ad3..fd16fc2a7e 100755 --- a/nova/tests/live_migration/hooks/ceph.sh +++ b/nova/tests/live_migration/hooks/ceph.sh @@ -8,6 +8,7 @@ function prepare_ceph { configure_ceph #install ceph-common package on compute nodes $ANSIBLE subnodes --become -f 5 -i "$WORKSPACE/inventory" -m raw -a "executable=/bin/bash + export CEPH_RELEASE=nautilus source $BASE/new/devstack/functions source $BASE/new/devstack/functions-common git clone https://git.openstack.org/openstack/devstack-plugin-ceph /tmp/devstack-plugin-ceph diff --git a/nova/tests/live_migration/hooks/run_tests.sh b/nova/tests/live_migration/hooks/run_tests.sh index 21768642ed..7f27c334ac 100755 --- a/nova/tests/live_migration/hooks/run_tests.sh +++ b/nova/tests/live_migration/hooks/run_tests.sh @@ -54,6 +54,11 @@ if [[ "$GRENADE_OLD_BRANCH" == "stable/ocata" ]]; then echo '3. Grenade testing with Ceph is disabled until bug 1691769 is fixed or Queens.' else echo '3. test with Ceph for root + ephemeral disks' + # NOTE(lyarwood): Pin the CEPH_RELEASE to nautilus here as was the case + # prior to https://review.opendev.org/c/openstack/devstack-plugin-ceph/+/777232 + # landing in the branchless plugin, we also have to pin in ceph.sh when + # configuring ceph on a remote node via ansible. + export CEPH_RELEASE=nautilus GetOSVersion prepare_ceph GLANCE_API_CONF=${GLANCE_API_CONF:-/etc/glance/glance-api.conf} |