aboutsummaryrefslogtreecommitdiff
path: root/bigtop_toolchain
diff options
context:
space:
mode:
authorOlaf Flebbe <of@ofleb.be>2015-12-30 12:25:03 +0100
committerOlaf Flebbe <of@ofleb.be>2015-12-30 12:46:48 +0100
commit46aa0fb243851cd4cfbe0029efcc658ad089350f (patch)
tree9777739d53ed3a751e2b8b8f628f45f90a24b519 /bigtop_toolchain
parent9a85ba9e87749b6506d3ee6207586b0bcb5a22c2 (diff)
downloadbigtop-odpi-46aa0fb243851cd4cfbe0029efcc658ad089350f.tar.gz
BIGTOP-2201: Fix BIGTOP-2200 again
Diffstat (limited to 'bigtop_toolchain')
-rw-r--r--bigtop_toolchain/manifests/protobuf.pp30
1 files changed, 10 insertions, 20 deletions
diff --git a/bigtop_toolchain/manifests/protobuf.pp b/bigtop_toolchain/manifests/protobuf.pp
index 97945094..110878cc 100644
--- a/bigtop_toolchain/manifests/protobuf.pp
+++ b/bigtop_toolchain/manifests/protobuf.pp
@@ -30,29 +30,19 @@ class bigtop_toolchain::protobuf {
case $operatingsystem{
/Ubuntu|Debian/: {
- exec { "/usr/bin/wget $url/libprotobuf8_2.5.0-9ubuntu1_$arch.deb":
- cwd => "/usr/src",
- creates => "/usr/src/libprotobuf8_2.5.0-9ubuntu1_$arch.deb",
- }
- exec { "/usr/bin/wget $url/libprotoc8_2.5.0-9ubuntu1_$arch.deb":
- cwd => "/usr/src",
- creates => "/usr/src/libprotoc8_2.5.0-9ubuntu1_$arch.deb",
- }
- exec { "/usr/bin/wget $url/protobuf-compiler_2.5.0-9ubuntu1_$arch.deb":
- cwd => "/usr/src",
- creates => "/usr/src/protobuf-compiler_2.5.0-9ubuntu1_$arch.deb",
- }
- exec {"/usr/bin/dpkg -i protobuf-compiler_2.5.0-9ubuntu1_$arch.deb":
- cwd => "/usr/src",
- require => [ EXEC["/usr/bin/dpkg -i libprotoc8_2.5.0-9ubuntu1_$arch.deb"],EXEC["/usr/bin/wget $url/protobuf-compiler_2.5.0-9ubuntu1_$arch.deb"] ]
- }
- exec {"/usr/bin/dpkg -i libprotoc8_2.5.0-9ubuntu1_$arch.deb":
+ $libprotobuf8 = "libprotobuf8_2.5.0-9ubuntu1_$arch.deb"
+ $libprotoc8 = "libprotoc8_2.5.0-9ubuntu1_$arch.deb"
+ $protobuf_compiler = "protobuf-compiler_2.5.0-9ubuntu1_$arch.deb"
+
+ exec { "download protobuf":
cwd => "/usr/src",
- require => [ EXEC["/usr/bin/dpkg -i libprotobuf8_2.5.0-9ubuntu1_$arch.deb"],EXEC["/usr/bin/wget $url/libprotoc8_2.5.0-9ubuntu1_$arch.deb"] ]
+ command => "/usr/bin/curl -L $url/$libprotobuf8 -o $libprotobuf8; /usr/bin/curl -L $url/$libprotoc8 -o $libprotoc8; /usr/bin/curl -L $url/$protobuf_compiler -o $protobuf_compiler",
+ creates => [ "/usr/src/$libprotobuf8", "/usr/src/$libprotoc8", "/usr/src/$protobuf_compiler" ]
}
- exec {"/usr/bin/dpkg -i libprotobuf8_2.5.0-9ubuntu1_$arch.deb":
+ exec { "install protobuf":
cwd => "/usr/src",
- require => EXEC["/usr/bin/wget $url/libprotobuf8_2.5.0-9ubuntu1_$arch.deb"],
+ command => "/usr/bin/dpkg -i $libprotobuf8 $libprotoc8 $protobuf_compiler",
+ require => EXEC["download protobuf"],
}
}
default: {