Remove downloads from ubuntu repo
As nodes should have access to ubuntu repository we don't need to download ubuntu packages in the pre_build_hook before installing the plugin. It also fixed https://bugs.launchpad.net/fuel/+bug/1435892 Change-Id: Idcbffefa4ae46e87a160a327269ac27d2df4ee36
This commit is contained in:
parent
5c85177037
commit
3675c297f0
|
@ -26,14 +26,6 @@ if $elasticsearch_kibana['node_name'] == hiera('user_node_name') {
|
|||
Ubuntu => 'openjdk-7-jre-headless'
|
||||
}
|
||||
|
||||
# Temporary workaround due to https://bugs.launchpad.net/fuel/+bug/1435892
|
||||
if $::osfamily == 'Debian' {
|
||||
package { 'tzdata':
|
||||
ensure => '2015d-0ubuntu0.14.04',
|
||||
before => Package[$java],
|
||||
}
|
||||
}
|
||||
|
||||
# Ensure that java is installed
|
||||
package { $java:
|
||||
ensure => installed,
|
||||
|
|
|
@ -32,15 +32,7 @@ function download {
|
|||
done
|
||||
}
|
||||
|
||||
# Packages needed to install JRE headless
|
||||
download deb http://mirrors.kernel.org/ubuntu/pool/main/p/pcsc-lite/libpcsclite1_1.8.10-1ubuntu1_amd64.deb \
|
||||
http://mirrors.kernel.org/ubuntu/pool/main/j/java-common/java-common_0.51_all.deb \
|
||||
http://mirrors.kernel.org/ubuntu/pool/main/t/tzdata/tzdata-java_2015d-0ubuntu0.14.04_all.deb \
|
||||
http://mirrors.kernel.org/ubuntu/pool/main/t/tzdata/tzdata_2015d-0ubuntu0.14.04_all.deb \
|
||||
http://security.ubuntu.com/ubuntu/pool/main/c/ca-certificates/ca-certificates_20141019ubuntu0.14.04.1_all.deb \
|
||||
http://mirrors.kernel.org/ubuntu/pool/main/c/ca-certificates-java/ca-certificates-java_20130815ubuntu1_all.deb \
|
||||
http://security.ubuntu.com/ubuntu/pool/main/o/openjdk-7/openjdk-7-jre-headless_7u79-2.5.5-0ubuntu0.14.04.2_amd64.deb \
|
||||
https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.4.4.deb
|
||||
download deb https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.4.4.deb
|
||||
|
||||
# For redhat only java 1.8 headless is needed
|
||||
download rpm http://mirror.centos.org/centos/6/updates/x86_64/Packages/java-1.8.0-openjdk-headless-1.8.0.31-1.b13.el6_6.x86_64.rpm \
|
||||
|
|
Loading…
Reference in New Issue