Fix installation dependency and authentication issue for fuel plugin

JIRA: YARDSTICK-516

Change-Id: I348959c2ea3b6ed586f487cde88a173eb593be4f
Signed-off-by: Edwin Zhai <edwin.zhai@intel.com>

diff --git a/fuel-plugin/deployment_scripts/install.sh b/fuel-plugin/deployment_scripts/install.sh
index 6882f0b..18f4fc2 100755 (executable)
--- 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 82dfff3..e693711 100644 (file)
--- 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')