aboutsummaryrefslogtreecommitdiff
path: root/bigtop_toolchain
diff options
context:
space:
mode:
authorOlaf Flebbe <of@ofleb.be>2015-11-16 13:57:37 +0100
committerOlaf Flebbe <of@ofleb.be>2015-11-16 13:57:37 +0100
commit1156139d97b1f2d639a0c5a7575ceac9abb999e8 (patch)
tree77019c8ab6f203817e0f0df7ba2460f0ba98071f /bigtop_toolchain
parent855c112e8171cd39b9ec84b64f6ba55c426d7612 (diff)
downloadbigtop-odpi-1156139d97b1f2d639a0c5a7575ceac9abb999e8.tar.gz
BIGTOP-2146: Upgrade bigtop toolchain ant version to 1.9.6
Diffstat (limited to 'bigtop_toolchain')
-rw-r--r--bigtop_toolchain/manifests/ant.pp17
-rw-r--r--bigtop_toolchain/manifests/deps.pp5
2 files changed, 11 insertions, 11 deletions
diff --git a/bigtop_toolchain/manifests/ant.pp b/bigtop_toolchain/manifests/ant.pp
index bf2d7f7d..1ac754f0 100644
--- a/bigtop_toolchain/manifests/ant.pp
+++ b/bigtop_toolchain/manifests/ant.pp
@@ -14,19 +14,24 @@
# limitations under the License.
class bigtop_toolchain::ant {
+ $ant = 'apache-ant-1.9.6'
include bigtop_toolchain::deps
- exec {'/bin/tar xvzf /usr/src/apache-ant-1.9.5-bin.tar.gz':
+ exec {"/usr/bin/wget http://archive.apache.org/dist/ant/binaries/$ant-bin.tar.gz":
+ cwd => "/usr/src",
+ unless => "/usr/bin/test -f /usr/src/$ant-bin.tar.gz",
+ }
+
+ exec {"/bin/tar xvzf /usr/src/$ant-bin.tar.gz":
cwd => '/usr/local',
- refreshonly => true,
- subscribe => Exec["/usr/bin/wget $bigtop_toolchain::deps::apache_prefix/ant/binaries/apache-ant-1.9.5-bin.tar.gz"],
- require => Exec["/usr/bin/wget $bigtop_toolchain::deps::apache_prefix/ant/binaries/apache-ant-1.9.5-bin.tar.gz"],
+ creates => "/usr/local/$ant",
+ require => Exec["/usr/bin/wget http://archive.apache.org/dist/ant/binaries/$ant-bin.tar.gz"],
}
file {'/usr/local/ant':
ensure => link,
- target => '/usr/local/apache-ant-1.9.5',
- require => Exec['/bin/tar xvzf /usr/src/apache-ant-1.9.5-bin.tar.gz'],
+ target => "/usr/local/$ant",
+ require => Exec["/bin/tar xvzf /usr/src/$ant-bin.tar.gz"],
}
}
diff --git a/bigtop_toolchain/manifests/deps.pp b/bigtop_toolchain/manifests/deps.pp
index 9ec2c20b..d265708f 100644
--- a/bigtop_toolchain/manifests/deps.pp
+++ b/bigtop_toolchain/manifests/deps.pp
@@ -18,11 +18,6 @@ class bigtop_toolchain::deps {
$apache_prefix = nearest_apache_mirror()
include bigtop_toolchain::packages
- exec {"/usr/bin/wget $apache_prefix/ant/binaries/apache-ant-1.9.5-bin.tar.gz":
- cwd => "/usr/src",
- require => Package[$packages::pkgs],
- unless => "/usr/bin/test -f /usr/src/apache-ant-1.9.5-bin.tar.gz",
- }
exec {"/usr/bin/wget $apache_prefix/maven/maven-3/3.3.3/binaries/apache-maven-3.3.3-bin.tar.gz":
cwd => "/usr/src",