From: hakcosar1 <hakan.cosar@publicispixelpark.de>
Date: Sat, 9 Sep 2017 01:19:25 +0000 (+0200)
Subject: java pkg
X-Git-Tag: v0.1.0~2480
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=918f97df0e92f0e8a889b45ef8ced5c7026a4e95;p=pixelpark%2Fhiera.git

java pkg
---

diff --git a/customer/cosar-test-customer/common.yaml b/customer/cosar-test-customer/common.yaml
index c13d7860..3a4c5fc4 100644
--- a/customer/cosar-test-customer/common.yaml
+++ b/customer/cosar-test-customer/common.yaml
@@ -2,6 +2,7 @@
 infra::role: base_for_old_systems
 infra::additional_classes:
   - accounts
+  - java
   - infra::profile::cron
   - repo::redhat::passenger  
   - siemens_puppet_general
@@ -12,6 +13,9 @@ puppetconf::server: puppetmaster01.pixelpark.com
 infra::profile::aem::author::backup_command: '/bin/echo "test"'
 infra::profile::aem::publish::backup_command: '/bin/echo "test"'
 
+java::package: java-1.8.0-oraclejdk
+java::version: 1.8.0.131
+
 ntp::servers:
   - '0.pool.ntp.org iburst minpoll 6 maxpoll 10'
   - '1.pool.ntp.org iburst minpoll 6 maxpoll 10'
diff --git a/customer/cosar-test-customer/test-aem-siemens.pixelpark.net.yaml b/customer/cosar-test-customer/test-aem-siemens.pixelpark.net.yaml
index c245e1e5..cfe3a165 100644
--- a/customer/cosar-test-customer/test-aem-siemens.pixelpark.net.yaml
+++ b/customer/cosar-test-customer/test-aem-siemens.pixelpark.net.yaml
@@ -2,10 +2,9 @@
 infra::role: base_for_old_systems  # because we don't need xymon
 infra::additional_classes:
   - maven
-  - siemens_puppet_general::java
   - infra::profile::aem::author
 
-siemens_puppet_general::java::filename: 'jre-8u131-linux-x64.rpm'
+#siemens_puppet_general::java::filename: 'jre-8u131-linux-x64.rpm'
 
 aem::base_dir: '/opt/aem6/author_siemens_com'
 aem::backup_dir: '/opt/aem6/author_siemens_com/backup'