Rebase to fuel 10.0 for fuel@opnfv D release

Change-Id: I22dd8c1fe4bc7f05bddadaed3f67fae986e5f86a
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 76ef433..6882f0b 100755 (executable)
--- a/fuel-plugin/deployment_scripts/install.sh
+++ b/fuel-plugin/deployment_scripts/install.sh
@@ -25,6 +25,6 @@ easy_install -U setuptools
 
 cd $BIN_HOME
 
-curl http://$HOST:8080/plugins/fuel-plugin-yardstick-0.9/repositories/ubuntu/yardstick.tar.gz | tar xzvf -
+curl http://$HOST:8080/plugins/fuel-plugin-yardstick-1.0/repositories/ubuntu/yardstick.tar.gz | tar xzvf -
 
 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 7993524..82dfff3 100644 (file)
--- a/fuel-plugin/deployment_scripts/puppet/manifests/yardstick-install.pp
+++ b/fuel-plugin/deployment_scripts/puppet/manifests/yardstick-install.pp
@@ -16,7 +16,7 @@ $identity_uri           = "${internal_auth_protocol}://${internal_auth_address}:
 $auth_url               = "${identity_uri}/${auth_api_version}"
 
 exec { "install yardstick":
-    command => "curl http://${master_ip}:8080/plugins/fuel-plugin-yardstick-0.9/deployment_scripts/install.sh | bash -s ${master_ip}",
+    command => "curl http://${master_ip}:8080/plugins/fuel-plugin-yardstick-1.0/deployment_scripts/install.sh | bash -s ${master_ip}",
     path   => "/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin";
 }
 

diff --git a/fuel-plugin/metadata.yaml b/fuel-plugin/metadata.yaml
index 2f6c952..e9aebaf 100644 (file)
--- a/fuel-plugin/metadata.yaml
+++ b/fuel-plugin/metadata.yaml
@@ -3,11 +3,11 @@ name: fuel-plugin-yardstick
 # Human-readable name for your plugin
 title: Install Yardstick
 # Plugin version
-version: '0.9.0'
+version: '1.0.0'
 # Description
 description: Installs Yardstick
 # Required fuel version
-fuel_version: ['9.0']
+fuel_version: ['10.0']
 # Specify license of your plugin
 licenses: ['Apache License Version 2.0']
 # Specify author or company name
@@ -27,7 +27,7 @@ package_version: '4.0.0'
 # The plugin is compatible with releases in the list
 releases:
   - os: ubuntu
-    version: mitaka-9.0
+    version: newton-10.0
     mode: ['ha']
     deployment_scripts_path: deployment_scripts/
     repository_path: repositories/ubuntu