diff options
| author |   Edwin Zhai <edwin.zhai@intel.com> | 2016-12-25 16:00:06 -0800 |
|---|---|---|
| committer | Edwin Zhai <edwin.zhai@intel.com> | 2016-12-27 14:54:09 -0800 |
| commit | 2cdd3b312fa85fdd73bf676a05e3c76cf7c2d838 (patch) | |
| tree | d1a04154b107e1541ed9d84f011b00ea1f2a694c | |
| parent | ca1bb41a5af846e150b8f4d87f336eec05ea21f8 (diff) | |
Fix installation dependency and authentication issue for fuel plugin
JIRA: YARDSTICK-516
Change-Id: I348959c2ea3b6ed586f487cde88a173eb593be4f
Signed-off-by: Edwin Zhai <edwin.zhai@intel.com>
| -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') |