Rebase to fuel 10.0

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

diff --git a/src/fuel-plugin/README.md b/src/fuel-plugin/README.md
index becb10a..8c6d5a2 100644 (file)
--- a/src/fuel-plugin/README.md
+++ b/src/fuel-plugin/README.md
@@ -9,7 +9,7 @@ Requirements
 
 | Requirement                      | Version/Comment |
 |----------------------------------|-----------------|
-| Mirantis OpenStack compatibility | 9.0             |
+| Mirantis OpenStack compatibility | 10.0            |
 
 
 Documents

diff --git a/src/fuel-plugin/deployment_scripts/install.sh b/src/fuel-plugin/deployment_scripts/install.sh
index 08fc274..807e568 100755 (executable)
--- a/src/fuel-plugin/deployment_scripts/install.sh
+++ b/src/fuel-plugin/deployment_scripts/install.sh
@@ -15,7 +15,7 @@ apt-get install -y collectd
 
 rm -rf $INSTALL_HOME; mkdir -p $INSTALL_HOME
 cd $INSTALL_HOME
-curl http://$HOST:8080/plugins/fuel-plugin-collectd-ceilometer-0.9/repositories/ubuntu/collectd-ceilometer.tgz | tar xzvf -
+curl http://$HOST:8080/plugins/fuel-plugin-collectd-ceilometer-1.0/repositories/ubuntu/collectd-ceilometer.tgz | tar xzvf -
 
 cat << EOF > /etc/collectd/collectd.conf.d/collectd-ceilometer-plugin.conf
 <LoadPlugin python>

diff --git a/src/fuel-plugin/deployment_scripts/puppet/manifests/collectd-ceilometer_install.pp b/src/fuel-plugin/deployment_scripts/puppet/manifests/collectd-ceilometer_install.pp
index 6b6a76d..cd77016 100644 (file)
--- a/src/fuel-plugin/deployment_scripts/puppet/manifests/collectd-ceilometer_install.pp
+++ b/src/fuel-plugin/deployment_scripts/puppet/manifests/collectd-ceilometer_install.pp
@@ -12,7 +12,7 @@ $ceilometer_hash   = hiera_hash('ceilometer', {'user'=>'ceilometer'})
 $auth_user         = 'ceilometer'
 $auth_password     = $ceilometer_hash['user_password']
 
-$exe_url = "http://${master_ip}:8080/plugins/fuel-plugin-collectd-ceilometer-0.9/deployment_scripts/install.sh"
+$exe_url = "http://${master_ip}:8080/plugins/fuel-plugin-collectd-ceilometer-1.0/deployment_scripts/install.sh"
 
 if ($use_ceilometer) {
 

diff --git a/src/fuel-plugin/metadata.yaml b/src/fuel-plugin/metadata.yaml
index ce92022..0d4f8f6 100644 (file)
--- a/src/fuel-plugin/metadata.yaml
+++ b/src/fuel-plugin/metadata.yaml
@@ -3,11 +3,11 @@ name: fuel-plugin-collectd-ceilometer
 # Human-readable name for your plugin
 title: Deploy Collectd Ceilometer Plugin
 # Plugin version
-version: '0.9.0'
+version: '1.0.0'
 # Description
 description: Deploy Collectd Ceilometer Plugin
 # 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
@@ -23,7 +23,7 @@ is_hotpluggable: true
 # 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