diff options
| author |   liang gao <jean.gaoliang@huawei.com> | 2016-10-09 01:51:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-10-09 01:51:07 +0000 |
| commit | 04547421604c8f30152d1947500988c2081fd54a (patch) | |
| tree | 8d873defbb9732dd20fc927b27a2f3fe653a7a13 | |
| parent | bad9d331305e9e6331d7194d4b7232a61132e8a2 (diff) | |
| parent | d9612bb6cdc275fe27679d5421321300610d1f79 (diff) | |
Merge "Rebase to fuel 10.0 for fuel@opnfv D release"
| -rwxr-xr-x | fuel-plugin/deployment_scripts/install.sh | 2 | ||||
| -rw-r--r-- | fuel-plugin/deployment_scripts/puppet/manifests/yardstick-install.pp | 2 | ||||
| -rw-r--r-- | fuel-plugin/metadata.yaml | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/fuel-plugin/deployment_scripts/install.sh b/fuel-plugin/deployment_scripts/install.sh index 76ef433c2..6882f0be2 100755 --- 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 7993524d0..82dfff387 100644 --- 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 2f6c95281..e9aebaf2a 100644 --- 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 |