From 7b267b442001a3f4cfccb13759a7aaa6f20afaec Mon Sep 17 00:00:00 2001 From: Pawel Kaminski Date: Thu, 31 Oct 2019 05:18:58 -0400 Subject: [PATCH] test/openstack: Adjust installation file to newest changes in devstack. Use python3 when installing devstack. Increase timeouts in order to tests pass in our CI environment. Change-Id: I6b88e39f9a8f0b8aa255098dc62b881168777ec3 Signed-off-by: Pawel Kaminski Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/472921 Tested-by: SPDK CI Jenkins Reviewed-by: Maciej Szwed Reviewed-by: Karol Latecki Reviewed-by: Jim Harris Reviewed-by: Tomasz Zawadzki --- scripts/vagrant/local.conf | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/scripts/vagrant/local.conf b/scripts/vagrant/local.conf index f602097c6..1449e1563 100644 --- a/scripts/vagrant/local.conf +++ b/scripts/vagrant/local.conf @@ -1,11 +1,10 @@ [[local|localrc]] -enable_plugin heat https://git.openstack.org/openstack/heat stable/stein -enable_plugin tacker https://git.openstack.org/openstack/tacker stable/stein ADMIN_PASSWORD=secret DATABASE_PASSWORD=secret RABBIT_PASSWORD=secret SERVICE_PASSWORD=secret HOST_IP=10.0.2.15 +USE_PYTHON3=True # These options define expected driver capabilities TEMPEST_VOLUME_DRIVER=spdk @@ -18,8 +17,20 @@ LIBVIRT_FIREWALL_DRIVER=nova.virt.firewall.NoopFirewallDriver CINDER_SECURE_DELETE=False public_interface=eth0 +[[test-config|$TEMPEST_CONFIG]] +[compute] +build_timeout = 1200 +fixed_network_name = net0 + +[volume] +build_timeout = 1200 + +[validation] +ssh_timeout = 396 + [[post-config|$CINDER_CONF]] [DEFAULT] +default_volume_type = SPDK enabled_backends = spdk target_helper = spdk-nvmeof debug = True @@ -35,4 +46,5 @@ target_protocol = nvmet_rdma target_helper = spdk-nvmeof target_prefix = nqn.2014-08.org.spdk volume_driver = cinder.volume.drivers.spdk.SPDKDriver -volume_backend_name = lvmdriver-1 +volume_backend_name = SPDK +spdk_max_queue_depth = 32