5 files changed, 69 insertions, 31 deletions
diff --git a/fuel-plugin/README.md b/fuel-plugin/README.md
index b5a954269..8c00d4b68 100644
--- a/fuel-plugin/README.md
+++ b/fuel-plugin/README.md
@@ -4,16 +4,13 @@ plugin-yardstick
 Plugin description
 Installs Yardstick on base-os node via a fuel plugin.
 
-
-To build:
-1) install fuel plugin builder (fpb)
-	sudo apt-get install createrepo rpm dpkg-dev
-	easy_install pip
-	pip install fuel-plugin-builder
-
+1) install vagrant fuel plugin builder (fpb)
+    sudo apt-get install -y ruby-dev rubygems-integration python-pip rpm createrepo dpkg-dev
+    sudo gem install fpm
+    sudo pip install fuel-plugin-builder
 2) build plugin
-	fpb --build <plugin-name>
-	e.g.: fpb --build plugin-yardstick
+    fpb --build <plugin-dir>
+    e.g.: fpb --build yardstick/fuel-plugin
 
 3) copy plugin rpm to fuel master
 	e.g. scp plugin-yardstick-0.1-0.1.0-1.noarch.rpm <user>@<server-name>:~/
@@ -33,4 +30,7 @@ To build:
 8) run
 Once deployed, SSH to deployed node. Find IP of yardstick node.
 SSH to yardstick node, Activate yardstick:
-	source yardstick_env/bin/activate
+    source /var/lib/yardstick.openrc
+    source /var/lib/yardstick/bin/activate
+    export EXTERNAL_NETWORK="admin_floating_net"
+    yardstick task start /opt/yardstick/fuel-plugin/fuel_ping.yaml
diff --git a/fuel-plugin/deployment_scripts/install.sh b/fuel-plugin/deployment_scripts/install.sh
index f0bb3e366..84ef96c48 100755
--- a/fuel-plugin/deployment_scripts/install.sh
+++ b/fuel-plugin/deployment_scripts/install.sh
@@ -3,24 +3,24 @@
 set -eux
 
 HOST=$1
-INSTALL_HOME=/opt/yardstick
-rm -rf $INSTALL_HOME; mkdir -p $INSTALL_HOME
+BIN_HOME=/opt/yardstick
+VAR_HOME=/var/lib/yardstick
+rm -rf $BIN_HOME; mkdir -p $BIN_HOME
+rm -rf $VAR_HOME; mkdir -p $VAR_HOME
 
-cd $INSTALL_HOME
-
-sudo apt-get install -y python-virtualenv python-dev python-pip libffi-dev libssl-dev libxml2-dev libxslt1-dev
-pip install --user virtualenv
-pip install --upgrade virtualenv
+sudo apt-get install -y python-dev python-pip libffi-dev libssl-dev libxml2-dev libxslt1-dev
+pip install virtualenv
 
 # create python virtual env
-virtualenv $INSTALL_HOME/yardstick_venv
-# source $INSTALL_HOME/yardstick_venv/bin/activate
+virtualenv $VAR_HOME
+
+export PS1="yardstick"
+source $VAR_HOME/bin/activate
 
 easy_install -U setuptools
 
-mkdir bin
-cd $INSTALL_HOME/bin
+cd $BIN_HOME
 
 curl http://$HOST:8080/plugins/fuel-plugin-yardstick-0.9/repositories/ubuntu/yardstick.tar.gz | tar xzvf -
 
-pip install -r tests/ci/requirements.txt
+python setup.py develop
diff --git a/fuel-plugin/deployment_scripts/puppet/manifests/yardstick-install.pp b/fuel-plugin/deployment_scripts/puppet/manifests/yardstick-install.pp
index 6547cb452..7993524d0 100644
--- a/fuel-plugin/deployment_scripts/puppet/manifests/yardstick-install.pp
+++ b/fuel-plugin/deployment_scripts/puppet/manifests/yardstick-install.pp
@@ -7,6 +7,7 @@ $admin_user     = $access_hash['user']
 $admin_password = $access_hash['password']
 $region         = hiera('region', 'RegionOne')
 
+$auth_api_version       = 'v2.0'
 $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')
@@ -19,7 +20,7 @@ exec { "install yardstick":
     path   => "/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin";
 }
 
-osnailyfacter::credentials_file { '/opt/yardstick/openrc':
+osnailyfacter::credentials_file { '/var/lib/yardstick.openrc':
   admin_user          => $admin_user,
   admin_password      => $admin_password,
   admin_tenant        => $admin_tenant,
diff --git a/fuel-plugin/fuel_ping.yaml b/fuel-plugin/fuel_ping.yaml
new file mode 100644
index 000000000..e367e98d1
--- /dev/null
+++ b/fuel-plugin/fuel_ping.yaml
@@ -0,0 +1,43 @@
+---
+# Sample file copied from  sampls/ping.yaml
+# context part is modified according to fuel default env
+
+schema: "yardstick:task:0.1"
+
+scenarios:
+-
+  type: Ping
+  options:
+    packetsize: 200
+  host: athena.demo
+  target: ares.demo
+
+  runner:
+    type: Duration
+    duration: 60
+    interval: 1
+
+  sla:
+    max_rtt: 10
+    action: monitor
+
+context:
+  name: demo
+  image: TestVM
+  flavor: m1.micro
+  user: cirros
+
+  placement_groups:
+    pgrp1:
+      policy: "availability"
+
+  servers:
+    athena:
+      floating_ip: true
+      placement: "pgrp1"
+    ares:
+      placement: "pgrp1"
+
+  networks:
+    test:
+      cidr: '192.169.111.0/24'
diff --git a/fuel-plugin/vagrant/build_fuel_plugin.sh b/fuel-plugin/vagrant/build_fuel_plugin.sh
index b016176fb..ddf2d6a6e 100755
--- a/fuel-plugin/vagrant/build_fuel_plugin.sh
+++ b/fuel-plugin/vagrant/build_fuel_plugin.sh
@@ -1,14 +1,8 @@
 #!/bin/bash
 sudo apt-get update -y
-sudo apt-get install createrepo rpm dpkg-dev -y
-sudo apt-get install python-setuptools -y
-sudo apt-get install python-pip -y
-sudo easy_install pip
-sudo pip install fuel-plugin-builder
-sudo apt-get install ruby -y
-sudo gem install rubygems-update
+sudo apt-get install -y ruby-dev rubygems-integration python-pip rpm createrepo dpkg-dev
 sudo gem install fpm
-sudo apt-get install docker.io -y
+sudo pip install fuel-plugin-builder
 cp -r /yardstick /home/vagrant
 cd /home/vagrant/yardstick/fuel-plugin;
 rm -rf vagrant/.vagrant