Merge "Convert legacy nova-live-migration and nova-multinode-grenade …

…to py3"
Centrinix · Nov 18, 2019 · 449a5e7 · 449a5e7
2 parents c956a88 + 85a1dd3
commit 449a5e7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/gate/live_migration/hooks/ceph.sh b/gate/live_migration/hooks/ceph.sh
@@ -6,8 +6,9 @@ function prepare_ceph {
     source /tmp/devstack-plugin-ceph/devstack/lib/ceph
     install_ceph
     configure_ceph
-    #install ceph-common package on compute nodes
+    #install ceph-common package and additional python3 ceph libraries on compute nodes
     $ANSIBLE subnodes --become -f 5 -i "$WORKSPACE/inventory" -m raw -a "executable=/bin/bash
+    USE_PYTHON3=${USE_PYTHON3:-True}
     source $BASE/new/devstack/functions
     source $BASE/new/devstack/functions-common
     git clone https://opendev.org/openstack/devstack-plugin-ceph /tmp/devstack-plugin-ceph

diff --git a/gate/live_migration/hooks/run_tests.sh b/gate/live_migration/hooks/run_tests.sh
@@ -56,6 +56,7 @@ echo '4. test with Ceph for root + ephemeral disks'
 # Discover and set variables for the OS version so the devstack-plugin-ceph
 # scripts can find the correct repository to install the ceph packages.
 GetOSVersion
+USE_PYTHON3=${USE_PYTHON3:-True}
 prepare_ceph
 GLANCE_API_CONF=${GLANCE_API_CONF:-/etc/glance/glance-api.conf}
 configure_and_start_glance

diff --git a/playbooks/legacy/nova-grenade-multinode/run.yaml b/playbooks/legacy/nova-grenade-multinode/run.yaml
@@ -33,6 +33,7 @@
           export DEVSTACK_GATE_NEUTRON=1
           export DEVSTACK_GATE_TEMPEST_NOTESTS=1
           export DEVSTACK_GATE_GRENADE=pullup
+          export DEVSTACK_GATE_USE_PYTHON3=True
           # By default grenade runs only smoke tests so we need to set
           # RUN_SMOKE to False in order to run live migration tests using
           # grenade

diff --git a/playbooks/legacy/nova-live-migration/run.yaml b/playbooks/legacy/nova-live-migration/run.yaml
@@ -47,6 +47,7 @@
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_TEMPEST_NOTESTS=1
           export DEVSTACK_GATE_TOPOLOGY="multinode"
+          export DEVSTACK_GATE_USE_PYTHON3=True
           function post_test_hook {
               /opt/stack/new/nova/gate/live_migration/hooks/run_tests.sh
               $BASE/new/nova/gate/test_evacuate.sh