From 5df5198c8b178debaf0e7190a42fa6cc2851b633 Mon Sep 17 00:00:00 2001 From: Guo Ruijing Date: Fri, 20 May 2016 10:35:39 +0800 Subject: Rebase to fuel 9.0 and add vagrant based build and enhance some scripts Change-Id: Id3a38d662c330cd388c6509c9d6e90409c1da6e7 Signed-off-by: Guo Ruijing --- .../deployment_scripts/puppet/manifests/vsperf-install.pp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'fuel-plugin-vsperf/deployment_scripts/puppet/manifests/vsperf-install.pp') diff --git a/fuel-plugin-vsperf/deployment_scripts/puppet/manifests/vsperf-install.pp b/fuel-plugin-vsperf/deployment_scripts/puppet/manifests/vsperf-install.pp index bd38dbb7..7d075add 100644 --- a/fuel-plugin-vsperf/deployment_scripts/puppet/manifests/vsperf-install.pp +++ b/fuel-plugin-vsperf/deployment_scripts/puppet/manifests/vsperf-install.pp @@ -1,11 +1,7 @@ $fuel_settings = parseyaml(file('/etc/astute.yaml')) $master_ip = $::fuel_settings['master_ip'] -exec { "wget vsperf": - command => "wget http://$master_ip:8080/plugins/fuel-plugin-vsperf-1.0/repositories/ubuntu/vswitchperf.tgz -O /opt/vswitchperf.tgz", - path => "/usr/bin:/usr/sbin:/bin:/sbin", -} -exec { "untar vsperf": - command => "tar xf /opt/vswitchperf.tgz -C /opt", - path => "/usr/bin:/usr/sbin:/bin:/sbin", +exec { "install vsperf": + command => "mkdir -p /opt/vswitchperf; curl http://$master_ip:8080/plugins/fuel-plugin-vsperf-1.0/repositories/ubuntu/vswitchperf.tgz | tar xzv -C /opt/vswitchperf", + path => "/usr/bin:/usr/sbin:/bin:/sbin"; } -- cgit 1.2.3-korg