siemens_general

diff --git a/customer/cosar-test-customer/common.yaml b/customer/cosar-test-customer/common.yaml
index 95a65d2b138da650a233c413ca7bbedaaa21b60e..9a16233d15181f00dc7b863cd02a4ef5ba920ddc 100644 (file)
--- a/customer/cosar-test-customer/common.yaml
+++ b/customer/cosar-test-customer/common.yaml
@@ -3,6 +3,7 @@ infra::role: base_for_old_systems
 infra::additional_classes:
   - accounts
   - infra::profile::cron
+  - siemens_general
 
 puppetconf::server: puppetmaster01.pixelpark.com
 
@@ -56,9 +57,3 @@ aem::maven::repos:
     url: 'https://nexus.pixelpark.com/content/groups/public/'
     releases:
       enabled: true
-aem::maven::servers:
-  - sirona-releases:
-    id: sirona-releases
-    username: sirona
-    password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAbTW1ZWhJ6XWqPPdsU4vXYYLQk8zEOh0y/a/g5SJ8bFH8ygZrbTNHeEaVTKLguF8Qai5diDKzL3pUiQUlRlbb6m69rf+g4hlNUM1n5PA6dfNnqUaMfpRH0X8VvhE6/Pgz/9zOep92UlVO9Aj78IZddWOjWd1Rj0KJ/RFoLBPfkXL7sgFv2pfoFMQIQ+5Yelaq+hy4vNbIKeJx1poHA9JEEl7O18bzYTO/TFzlvjbM4MphRvbM39c3F7IVV6A4PfZEYIFamHoijrWSuA9QoHCB6m5p/SgGisiKshpaQvBhAsmMmWXvHlFy0xifkt3ZllBPdSdtZuLnBHIpOAhNZcMZOTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBMwmGTKpQIcXGnUejWqwRFgCCDSr38JPWvgcVYUXTLTBOTx+GXPyygaUwFjHLOtIJnrQ==]
-      
\ No newline at end of file

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 7d48c279731c3aa46fb12cb8232a2d0fa75287cb..0da5c5b901ac5712084f7402451a62168af648a8 100644 (file)
--- 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:
   - infra::profile::aem::author
-  - java
-  - maven  
-  
-java::package: java-1.8.0-oraclejdk    
+  - maven      
+
+siemens_general::java::filename: 'jre-8u131-linux-x64.rpm'
 
 infra::profile::aem::params::base_dir: '/opt/aem'
 infra::profile::aem::params::user: 'pubadmin'