fixes
diff --git a/scripts/install.sh b/scripts/install.sh
index 1fd97b4..c767b3d 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -2,6 +2,10 @@
FULL="$1"
+pushd $(dirname "$0") > /dev/null
+SCRIPTPATH=$(pwd -P)
+popd > /dev/null
+
function install_apt() {
apt-get install -y python-openssl python-novaclient python-cinderclient \
python-keystoneclient python-glanceclient python-faulthandler \
@@ -15,8 +19,8 @@
function install_yum() {
yum -y install pyOpenSSL python-novaclient python-cinderclient \
- python-keystoneclient python-glanceclient
- python-pip
+ python-keystoneclient python-glanceclient \
+ python-pip python-ecdsa
if [ "$FULL" == "--full" ] ; then
yum -y install scipy numpy python-matplotlib python-psutil
@@ -34,7 +38,7 @@
fi
fi
-pip install -r requirements.txt
+pip install -r "$SCRIPTPATH/../requirements.txt"
if [ "$FULL" == "--full" ] ; then
pip install oktest iso8601==0.1.10
diff --git a/wally/fuel_rest_api.py b/wally/fuel_rest_api.py
index a0eb1ef..728ac94 100644
--- a/wally/fuel_rest_api.py
+++ b/wally/fuel_rest_api.py
@@ -351,7 +351,8 @@
creds['tenant_name'] = access['tenant']['value']
version = FuelInfo(self.__connection__).get_version()
- if version >= [7, 0]: #only HTTPS since 7.0
+ # only HTTPS since 7.0
+ if version >= [7, 0]:
creds['insecure'] = "True"
creds['os_auth_url'] = "https://{0}:5000/v2.0".format(
self.get_networks()['public_vip'])
diff --git a/wally/suits/io/fio.py b/wally/suits/io/fio.py
index 5945ab7..a3f0fe3 100644
--- a/wally/suits/io/fio.py
+++ b/wally/suits/io/fio.py
@@ -745,8 +745,8 @@
time.sleep(self.retry_time)
- wait(pool.submit(reconnect, node.connection, node.conn_url)
- for node in self.config.nodes)
+ wait([pool.submit(reconnect, node.connection, node.conn_url)
+ for node in self.config.nodes])
fname = "{0}_task.fio".format(pos)
with open(os.path.join(self.config.log_directory, fname), "w") as fd:
diff --git a/wally/suits/io/rrd.cfg b/wally/suits/io/rrd.cfg
index d6c04a0..131688f 100644
--- a/wally/suits/io/rrd.cfg
+++ b/wally/suits/io/rrd.cfg
@@ -1,12 +1,18 @@
-[global]
-include defaults.cfg
+[test]
+buffered=0
+group_reporting=1
+iodepth=16
+unified_rw_reporting=1
+norandommap=1
+thread=1
+time_based=1
+wait_for_previous=1
+filename=/dev/rbd1
+size=4G
ramp_time=15
runtime=3600
-numjobs=60
+numjobs=30
direct=1
-
-# ---------------------------------------------------------------------
-[test_{TEST_SUMM}]
blocksize=60k
rw=randwrite
-sync=1
+direct=1
diff --git a/wally/suits/io/test.cfg b/wally/suits/io/test.cfg
index 296da06..2977d1a 100644
--- a/wally/suits/io/test.cfg
+++ b/wally/suits/io/test.cfg
@@ -1,20 +1,19 @@
[test1]
+ioengine=libaio
buffered=0
group_reporting=1
-iodepth=1
+iodepth=16
unified_rw_reporting=1
norandommap=1
thread=1
time_based=1
wait_for_previous=1
-# this is critical for correct results in multy-node run
randrepeat=0
filename=/dev/rbd1
-size=10G
+size=4G
ramp_time=10
-runtime=30
-numjobs=160
-sync=1
+runtime=300
+numjobs=16
direct=1
blocksize=60k
rw=randwrite