From 68b6d0ef54a1dbdfc0dc55d526cdcaf9ce312e6e Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Wed, 23 Jun 2021 20:14:11 +0200 Subject: [PATCH] test/openstack: Enable securitygroup driver in neutron This seems to be needed for devstack pieced together out of the current master branch (wallaby seems to work fine as is). Signed-off-by: Michal Berger Change-Id: I5abf22a606c84c120e42819a5450ba82d1bc52b5 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8490 Tested-by: SPDK CI Jenkins Reviewed-by: Karol Latecki Reviewed-by: Pawel Piatek Reviewed-by: Maciej Szwed Reviewed-by: Tomasz Zawadzki Reviewed-by: Ben Walker --- test/openstack/install_devstack.sh | 10 ++++++++++ test/openstack/run_openstack_tests.sh | 3 +++ 2 files changed, 13 insertions(+) diff --git a/test/openstack/install_devstack.sh b/test/openstack/install_devstack.sh index c0e64da8d..7ad9d76f4 100755 --- a/test/openstack/install_devstack.sh +++ b/test/openstack/install_devstack.sh @@ -64,3 +64,13 @@ chown -R stack:stack /opt/stack su -c "./stack.sh" -s /bin/bash stack source openrc admin admin openstack volume type create SPDK --public + +if [[ $branch == master ]]; then + # FIXME: For some reason tempest won't work unless neutron has securitygroup enabled + # (even when testing with security_group disabled in tempest.conf). For the time + # being, until someone understands why this seem to be the case, patch the ml2 plugin + # config - instead of touching our local.conf which is still valid for the wallaby - + # to enable the securitygroup right before the tests start. + [[ -e /etc/neutron/plugins/ml2/ml2_conf.ini ]] + sed -i -e "s/enable_security_group = False/enable_security_group = True/g" /etc/neutron/plugins/ml2/ml2_conf.ini +fi diff --git a/test/openstack/run_openstack_tests.sh b/test/openstack/run_openstack_tests.sh index 781275f5e..1049eb974 100755 --- a/test/openstack/run_openstack_tests.sh +++ b/test/openstack/run_openstack_tests.sh @@ -41,6 +41,9 @@ timing_exit configure_spdk timing_enter restart_cinder sudo systemctl restart devstack@c-* sleep 10 +# Make sure neutron is restarted as well +sudo systemctl restart devstack@q-* +sleep 10 timing_exit restart_cinder rxe_cfg status