fbb-api - remove xymon from puppet management by applying old classes, recommendation...

diff --git a/customer/fbb-api/common.yaml b/customer/fbb-api/common.yaml
index 4d262d6a5ec7fcee6d83be08fb8cf7adfbcbb083..9f86656c903f2bbc19ce562d81971891eb4ff4cd 100644 (file)
--- a/customer/fbb-api/common.yaml
+++ b/customer/fbb-api/common.yaml
@@ -1,5 +1,4 @@
 ---
-infra::role: base
 infra::additional_classes:
   - infra::profile::postfix
   - infra::profile::cron

diff --git a/customer/fbb-api/development.yaml b/customer/fbb-api/development.yaml
index 16bfab00baa098aabbbdcd2f17621ae458996546..1865fec77c3b1f52ec1970fb399c55769197c589 100644 (file)
--- a/customer/fbb-api/development.yaml
+++ b/customer/fbb-api/development.yaml
@@ -1,4 +1,6 @@
 ---
+infra::role: base
+
 accounts::users:
   markus.baumann:
     apply: true

diff --git a/customer/fbb-api/production.yaml b/customer/fbb-api/production.yaml
index ae80c0971da83606a056f82cc017a20bc70b79f1..e37255753e7ae010a4654f08500d828e49e757b3 100644 (file)
--- a/customer/fbb-api/production.yaml
+++ b/customer/fbb-api/production.yaml
@@ -1,5 +1,7 @@
 ---
+infra::role: base_for_old_systems
 infra::additional_classes:
+  - accounts
   - infra::profile::apache_php
   - rabbitmq
   - logstash

diff --git a/customer/fbb-api/test.yaml b/customer/fbb-api/test.yaml
index 6822ab9158a4ee9e180e8bf33e3afa282ee5bb44..d5f96d182e3897433d4319f4d97faac4a5ce28ea 100644 (file)
--- a/customer/fbb-api/test.yaml
+++ b/customer/fbb-api/test.yaml
@@ -1,5 +1,8 @@
 ---
+infra::role: base_for_old_systems
+
 infra::additional_classes:
+  - accounts
   - infra::profile::apache_php
   - rabbitmq
   - logstash