diff options
| author |   Jing Lu <lvjing5@huawei.com> | 2016-12-29 02:16:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-12-29 02:16:41 +0000 |
| commit | 31f563b8aa2e6dcf652cb7e9dfdc3f6c7316dc1d (patch) | |
| tree | ff68d72d9bd2bbb545d0c070cc0c5479322f10b3 | |
| parent | 827e341ed222a562a87d8f238fc0a6a16cfb1393 (diff) | |
| parent | 2cdd3b312fa85fdd73bf676a05e3c76cf7c2d838 (diff) | |
Merge "Fix installation dependency and authentication issue for fuel plugin"
| -rwxr-xr-x | fuel-plugin/deployment_scripts/install.sh | 5 | ||||
| -rw-r--r-- | fuel-plugin/deployment_scripts/puppet/manifests/yardstick-install.pp | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/fuel-plugin/deployment_scripts/install.sh b/fuel-plugin/deployment_scripts/install.sh index 6882f0be2..18f4fc2c2 100755 --- a/fuel-plugin/deployment_scripts/install.sh +++ b/fuel-plugin/deployment_scripts/install.sh @@ -27,4 +27,7 @@ cd $BIN_HOME curl http://$HOST:8080/plugins/fuel-plugin-yardstick-1.0/repositories/ubuntu/yardstick.tar.gz | tar xzvf - -python setup.py develop +# install dependency +pip install -r requirements.txt + +python setup.py install diff --git a/fuel-plugin/deployment_scripts/puppet/manifests/yardstick-install.pp b/fuel-plugin/deployment_scripts/puppet/manifests/yardstick-install.pp index 82dfff387..e69371141 100644 --- a/fuel-plugin/deployment_scripts/puppet/manifests/yardstick-install.pp +++ b/fuel-plugin/deployment_scripts/puppet/manifests/yardstick-install.pp @@ -7,7 +7,7 @@ $admin_user = $access_hash['user'] $admin_password = $access_hash['password'] $region = hiera('region', 'RegionOne') -$auth_api_version = 'v2.0' +$auth_api_version = '' $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') |