mbch-tmodell - make puppet happy

diff --git a/customer/mbch-tmodell/common.yaml b/customer/mbch-tmodell/common.yaml
index 049b510969bc67a6d3e0b8eabd2540ce650edbb6..eb67c3c3e48df624a4018c4ad7cfa7f39424ed34 100644 (file)
--- a/customer/mbch-tmodell/common.yaml
+++ b/customer/mbch-tmodell/common.yaml
@@ -1,4 +1,9 @@
 ---
+site::role: base
+site::additional_classes:
+  - site::profile::ruby_passenger
+  - site::profile::mysql_server
+
 accounts::users:
   deploy.hamburg:
     uid: 60201

diff --git a/customer/mbch-tmodell/test-www-e-klasse-t-modell-ch.pixelpark.net.yaml b/customer/mbch-tmodell/test-www-e-klasse-t-modell-ch.pixelpark.net.yaml
index 9697cc7566ee9962d09a400bf7b8f0cd15e4a16a..a3534030f7cf460781e8f5fa7efb758967024f4c 100644 (file)
--- a/customer/mbch-tmodell/test-www-e-klasse-t-modell-ch.pixelpark.net.yaml
+++ b/customer/mbch-tmodell/test-www-e-klasse-t-modell-ch.pixelpark.net.yaml
@@ -1,8 +1,4 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::ruby_passenger
-  - site::profile::mysql_server
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAVphaT//OpAFXb1tzi049WDOLUrxo5zlZBwxzNOm+hWE6//1QBCCnIN0VO70OVUIL9IjgqLyLZOPlEbcz8CGyx+G3B2IDBwh/IJIKABkSzm3eXU5aqbNdtxYo9YN/Hb5f4selcpXWP6cp3MYJ7RWPt4bDACPk/pdTWV9jaAz2fOAOiXTcdGt9COCiw3N+tXMtp0Bl9tJwe9c/TSG/noYmJm8IcBF8b4Xw7NnZvKiXNMbqyB8gQiDnrDE8Qrgwi6qBRLwPeQ7XxAFl5BNLqyUzpoVLeso7ETaqHDWcuGEQneKIWJZ7FMgCaiVjhgRnVqWXradXn4y5WeLM/nHtVb5tYzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBD0eow/cSInwD3H0q+oYFdWgCCd3XoLqBBNX+i6FeU7PxRWDLYS2w1+BHaidZRzA+x97Q==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAvO9tbteIdbXryVHcDaSXX9dpMHsUQ+y106A7xPIqVmVoGTuj+5Vz+0g5lOVplFeP4DZQB/M5Q9CGrVfvRfO4F2rMaN+Dy2lvOiFLZEQ5KWKisBaoXU8fk+dLDgtScSUPMj0q2j31IA2yGipS3+L1xORIXNOlvxxLziddfb8KatMbG9N8kYh8ztT3pkOHX9FpZlxw9wN9byrc2L3e8BC0rRneerqzbe7n9QbtncGR2Z9qX4vjG0vHW1PFpk1ePdDuaflXdBDF0i9zGCyy7YITJXB88TbywhcwugdVbINoY7VC1a81uZGoHuACevJKOLaZjEMlHZhiV1BF+Gb+UQpnZTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBwEzjT2emf/WEXunq5l2BEgCAl8I1R+Ag0rc0vRq3/OgTjLbbyP2/fhHcn639HVjg4wA==]

diff --git a/customer/mbch-tmodell/www-e-klasse-t-modell-ch.pixelpark.net.yaml b/customer/mbch-tmodell/www-e-klasse-t-modell-ch.pixelpark.net.yaml
index 3c13418a65514e124cbced3133132f38a1c50949..b196217ab09cbb14ed1d1ca9c52908c26db9efd0 100644 (file)
--- a/customer/mbch-tmodell/www-e-klasse-t-modell-ch.pixelpark.net.yaml
+++ b/customer/mbch-tmodell/www-e-klasse-t-modell-ch.pixelpark.net.yaml
@@ -1,8 +1,4 @@
 ---
-site::role: base
-site::additional_classes:
-  - site::profile::ruby_passenger
-  - site::profile::mysql_server
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAPRXlA6AWdjZsk58ZiKR8s3WpulXkUEXUlpkaK3QD3CLOijnFhaB64FPFxwDPaNX0dcUVVpCH/5tfrtraEr5eiMefKI61jlMBev18E4/epbrS2DzophuNScmFHf7hBnqRymgZEsPF4EpProBgTCjMkkeeVsMjM4pQhBSKJPBI1+GfOM2nocCBVx0SyDTdFIdLuMNn4FQkba70em3HRuVsa8CdHl6JeZj6DvBj6dDjT/tAX4yoE6JZg140l/73HfmbOivyn9XwLlnN0K2/wpmCPHz07lfDzSqe8+ufyrAP0xXKq1MmNu+OGZRJ9LVEsAmVQTwT4SuZSRPfD4XaFYRvTzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAwLNdeBIL3hc7hc1v6LsRQgCDMvi/9uCs/LDvUlZq3iuaHmgSztawxZ+Tx/XyIz1TzwA==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAbz2f1nevHNfH2EOz1pBO2cyFdTTtgE8xMwXHcPyzlNCGhcHm4WWpgpEW1YOBO7LRfOfgUe9jNIK6/3EMkOdMqbsbxe8Z02luzx5OO8TnH/7H4a/gy8YgNZy9MDBHEQHjpUD+kKvmN9Xqktag5kJuoZDcer07FPK6WXnngN/Ew4yKqgfMJwB/4acIhVAOYkcP/x6YL9gO90OUvKHiTZYUnGJ632IgcpqOwAVrLqL4NkbBEjdubiccb5tMfApgmyFPJ+B10hGop2rsQUtxI3SSpKQc8nRrMAMFnBB6EDK/o4561IEmugXyRvDy5DemMq9EBmAvwOp4tcrL51SmCz+H2jBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAGyG6OMGUsDwTr6QjlqFeKgCBttFii1kPvGQngtEjj1WBrIC7sBbsIBQPCO9MEUuqzSg==]