diff options
| author |   liang gao <jean.gaoliang@huawei.com> | 2016-07-11 09:16:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-07-11 09:16:17 +0000 |
| commit | cd9d1296ab33b0193bfd37e77241291065d9a06b (patch) | |
| tree | afa766272700f313609fcb23561a1f51c3189886 | |
| parent | 567694e4db2d0776db6c115b98f54a4737e52124 (diff) | |
| parent | e24c6c15d1ade7e0ddd1a39810bb803ed3bd9d56 (diff) | |
Merge "Update fuel plugin"
| -rwxr-xr-x | fuel-plugin/deployment_scripts/install.sh | 24 | ||||
| -rw-r--r-- | fuel-plugin/deployment_scripts/puppet/manifests/yardstick-install.pp | 3 | ||||
| -rwxr-xr-x | fuel-plugin/vagrant/build_fuel_plugin.sh | 10 |
3 files changed, 16 insertions, 21 deletions
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/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 |