diff options
| -rwxr-xr-x | fuel-plugin/deployment_scripts/install.sh | 5 | ||||
| -rw-r--r-- | fuel-plugin/deployment_scripts/puppet/manifests/yardstick-install.pp | 2 | ||||
| -rw-r--r-- | samples/ping_load.yaml | 65 | ||||
| -rw-r--r-- | yardstick/common/openstack_utils.py | 1 |
4 files changed, 70 insertions, 3 deletions
diff --git a/fuel-plugin/deployment_scripts/install.sh b/fuel-plugin/deployment_scripts/install.sh index 6882f0be2..18f4fc2c2 100755 --- a/fuel-plugin/deployment_scripts/install.sh +++ b/fuel-plugin/deployment_scripts/install.sh @@ -27,4 +27,7 @@ cd $BIN_HOME curl http://$HOST:8080/plugins/fuel-plugin-yardstick-1.0/repositories/ubuntu/yardstick.tar.gz | tar xzvf - -python setup.py develop +# install dependency +pip install -r requirements.txt + +python setup.py install diff --git a/fuel-plugin/deployment_scripts/puppet/manifests/yardstick-install.pp b/fuel-plugin/deployment_scripts/puppet/manifests/yardstick-install.pp index 82dfff387..e69371141 100644 --- a/fuel-plugin/deployment_scripts/puppet/manifests/yardstick-install.pp +++ b/fuel-plugin/deployment_scripts/puppet/manifests/yardstick-install.pp @@ -7,7 +7,7 @@ $admin_user = $access_hash['user'] $admin_password = $access_hash['password'] $region = hiera('region', 'RegionOne') -$auth_api_version = 'v2.0' +$auth_api_version = '' $service_endpoint = hiera('service_endpoint', $management_vip) $ssl_hash = hiera_hash('use_ssl', {}) $internal_auth_protocol = get_ssl_property($ssl_hash, {}, 'keystone', 'internal', 'protocol', 'http') diff --git a/samples/ping_load.yaml b/samples/ping_load.yaml new file mode 100644 index 000000000..370916822 --- /dev/null +++ b/samples/ping_load.yaml @@ -0,0 +1,65 @@ +--- +# Sample benchmark task config file +# Three scenarios run in parallel pinging one target vm. +# Multiple context are used to specify the host and target VMs. + +schema: "yardstick:task:0.1" +run_in_parallel: true + +scenarios: +{% for host in ['athena.demo1', 'apollo.demo1', 'kratos.demo1'] %} +- + type: Ping + options: + packetsize: 100 + host: {{host}} + target: hades.demo2 + runner: + type: Duration + duration: 60 + interval: 1 + sla: + max_rtt: 10 + action: assert +{% endfor %} + +contexts: +- + name: demo1 + image: cirros-0.3.3 + flavor: yardstick-flavor + user: cirros + + placement_groups: + pgrp1: + policy: "availability" + + servers: + athena: + floating_ip: true + placement: "pgrp1" + apollo: + floating_ip: true + placement: "pgrp1" + kratos: + floating_ip: true + placement: "pgrp1" + + networks: + test: + cidr: '10.0.1.0/24' +- + name: demo2 + image: cirros-0.3.3 + flavor: yardstick-flavor + user: cirros + placement_groups: + pgrp1: + policy: "availability" + servers: + hades: + floating_ip: true + placement: "pgrp1" + networks: + test: + cidr: '10.0.1.0/24' diff --git a/yardstick/common/openstack_utils.py b/yardstick/common/openstack_utils.py index 25dcffadd..d8dc61ef6 100644 --- a/yardstick/common/openstack_utils.py +++ b/yardstick/common/openstack_utils.py @@ -5,7 +5,6 @@ # are made available under the terms of the Apache License, Version 2.0 # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 -# yardstick: this file is copied from rally and slightly modified ############################################################################## import os |