Minor fixes in fuel plugin

1. update yardstick tasks
2. fix typo
3. update comments in pre_build_hook

Change-Id: Ib7fc87838d121dc35fb84220fbb0a9909c6592e1
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>

diff --git a/fuel-plugin/deployment_scripts/install.sh b/fuel-plugin/deployment_scripts/install.sh
index 84ef96c..76ef433 100755 (executable)
--- a/fuel-plugin/deployment_scripts/install.sh
+++ b/fuel-plugin/deployment_scripts/install.sh
@@ -8,7 +8,11 @@ VAR_HOME=/var/lib/yardstick
 rm -rf $BIN_HOME; mkdir -p $BIN_HOME
 rm -rf $VAR_HOME; mkdir -p $VAR_HOME
 
-sudo apt-get install -y python-dev python-pip libffi-dev libssl-dev libxml2-dev libxslt1-dev
+apt-get install -y python-dev python-pip libffi-dev libssl-dev libxml2-dev libxslt1-dev
+
+#apt-get install python-virtualenv cannot work
+#use pip to work around the issue
+
 pip install virtualenv
 
 # create python virtual env

diff --git a/fuel-plugin/deployment_tasks.yaml b/fuel-plugin/deployment_tasks.yaml
index 90fae71..6d53198 100644 (file)
--- a/fuel-plugin/deployment_tasks.yaml
+++ b/fuel-plugin/deployment_tasks.yaml
@@ -3,7 +3,7 @@
   role: [yardstick]
   requires: [deploy_start]
   required_for: [deploy_end]
-  tasks: [hiera, setup_repositories, fuel_pkgs, globals, tools, logging, netconfig, yardstick-install]
+  tasks: [hiera, setup_repositories, fuel_pkgs, globals, tools, logging, netconfig]
   parameters:
     strategy:
       type: parallel

diff --git a/fuel-plugin/fuel_ping.yaml b/fuel-plugin/fuel_ping.yaml
index e367e98..550dfbc 100644 (file)
--- a/fuel-plugin/fuel_ping.yaml
+++ b/fuel-plugin/fuel_ping.yaml
@@ -40,4 +40,4 @@ context:
 
   networks:
     test:
-      cidr: '192.169.111.0/24'
+      cidr: '192.168.111.0/24'

diff --git a/fuel-plugin/pre_build_hook b/fuel-plugin/pre_build_hook
index 9446d2a..9c0a40e 100755 (executable)
--- a/fuel-plugin/pre_build_hook
+++ b/fuel-plugin/pre_build_hook
@@ -10,7 +10,9 @@ function build_pkg {
     ubuntu)
       rm -rf ${DIR}/repositories/ubuntu; mkdir -p ${DIR}/repositories/ubuntu
 
-      # don't support online installation now
+      # fixme: don't support offline installation now since pip in
+      #  deployment_scripts/install.sh needs to access to internet
+      #
       # cd ${DIR}/repositories/ubuntu
       # Use aptititude; apt-get -d will skip download if package is already installed
       # sudo apt-get install aptitude -y