Merge "Fix cinder client version (rally-related issue)"
diff --git a/configure.sh b/configure.sh
index ae33aae..15059e1 100755
--- a/configure.sh
+++ b/configure.sh
@@ -82,8 +82,8 @@
fi
if [ $shared_count -eq 0 ]; then
echo "Let's create shared fixed net"
- neutron net-create --shared tempest-net
- neutron subnet-create --name tempest-subnet --gateway 192.168.0.1 --allocation-pool start=192.168.0.2,end=192.168.0.254 --ip-version 4 tempest-net 192.168.0.0/24
+ neutron net-create --shared fixed-net
+ neutron subnet-create --name fixed-subnet --gateway 192.168.0.1 --allocation-pool start=192.168.0.2,end=192.168.0.254 --ip-version 4 fixed-net 192.168.0.0/24
fi
FIXED_NET=$(neutron net-list -c name -c shared | grep True | awk '{print $2}' | tail -n 1)
echo "Fixed net is: $FIXED_NET"
diff --git a/tempest/tempest_ext.conf b/tempest/tempest_ext.conf
index 9d72500..9667a5e 100644
--- a/tempest/tempest_ext.conf
+++ b/tempest/tempest_ext.conf
@@ -83,11 +83,17 @@
endpoint_type = publicURL
[volume]
-min_microversion = 3.0
max_microversion = latest
build_timeout = 120
storage_protocol = ceph
endpoint_type = publicURL
+catalog_type = volumev3
+
+[service-clients]
+http_timeout = 100
+
+[service_available]
+cinder = True
[volume-feature-enabled]
api_v3 = true