add hiera changes for monitor node deployment - this requires that https://review.leap.se:8443/#/c/212 be merged in the platform to work right

2 files changed, 75 insertions, 0 deletions

diff --git a/hiera/chameleon.yaml b/hiera/chameleon.yaml
index 595b841..22ec485 100644
--- a/hiera/chameleon.yaml
+++ b/hiera/chameleon.yaml
@@ -315,10 +315,33 @@ nagios:
     - demo.bitmask.i
     - dev.bitmask.i
     - unstable.bitmask.i
+  environments: 
+    clientdev: 
+      contact_emails: 
+        - sysdev@leap.se
+    default: 
+      contact_emails: 
+        - sysdev@leap.se
+    demo: 
+      contact_emails: 
+        - elijah@leap.se
+        - sysdev@leap.se
+    development: 
+      contact_emails: 
+        - micah@leap.se
+        - sysdev@leap.se
+    production: 
+      contact_emails: 
+        - sysdev@leap.se
+    unstable: 
+      contact_emails: 
+        - sysdev@leap.se
+        - varac@leap.se
   hosts: 
     ant: 
       domain_full_suffix: demo.bitmask.net
       domain_internal: ant.demo.bitmask.i
+      environment: demo
       ip_address: "198.252.153.82"
       services: 
         - couchdb
@@ -326,6 +349,7 @@ nagios:
     canvasback: 
       domain_full_suffix: cdev.bitmask.net
       domain_internal: canvasback.cdev.bitmask.i
+      environment: clientdev
       ip_address: "199.119.112.4"
       services: 
         - webapp
@@ -333,6 +357,7 @@ nagios:
     chameleon: 
       domain_full_suffix: unstable.bitmask.net
       domain_internal: chameleon.unstable.bitmask.i
+      environment: unstable
       ip_address: "199.119.112.10"
       services: 
         - monitor
@@ -341,6 +366,7 @@ nagios:
     chipmonk: 
       domain_full_suffix: cdev.bitmask.net
       domain_internal: chipmonk.cdev.bitmask.i
+      environment: clientdev
       ip_address: "199.119.112.19"
       services: 
         - mx
@@ -348,6 +374,7 @@ nagios:
     clam: 
       domain_full_suffix: dev.bitmask.net
       domain_internal: clam.dev.bitmask.i
+      environment: development
       ip_address: "176.53.69.22"
       services: 
         - couchdb
@@ -356,6 +383,7 @@ nagios:
     deer: 
       domain_full_suffix: dev.bitmask.net
       domain_internal: deer.dev.bitmask.i
+      environment: development
       ip_address: "202.85.227.195"
       services: 
         - tor
@@ -363,6 +391,7 @@ nagios:
     demodex: 
       domain_full_suffix: dev.bitmask.net
       domain_internal: demodex.dev.bitmask.i
+      environment: development
       ip_address: "204.13.164.171"
       services: 
         - backup
@@ -370,6 +399,7 @@ nagios:
     elephant: 
       domain_full_suffix: dev.bitmask.net
       domain_internal: elephant.dev.bitmask.i
+      environment: development
       ip_address: "176.53.69.13"
       services: 
         - webapp
@@ -377,6 +407,7 @@ nagios:
     elk: 
       domain_full_suffix: dev.bitmask.net
       domain_internal: elk.dev.bitmask.i
+      environment: development
       ip_address: "176.53.69.127"
       services: 
         - couchdb
@@ -384,6 +415,7 @@ nagios:
     frog: 
       domain_full_suffix: bitmask.net
       domain_internal: frog.bitmask.i
+      environment: production
       ip_address: "199.119.112.23"
       services: 
         - static
@@ -391,6 +423,7 @@ nagios:
     gadwall: 
       domain_full_suffix: cdev.bitmask.net
       domain_internal: gadwall.cdev.bitmask.i
+      environment: clientdev
       ip_address: "199.119.112.5"
       services: 
         - couchdb
@@ -399,6 +432,7 @@ nagios:
     hippo: 
       domain_full_suffix: demo.bitmask.net
       domain_internal: hippo.demo.bitmask.i
+      environment: demo
       ip_address: "85.17.92.143"
       openvpn_gateway_address: "85.17.92.167"
       services: 
@@ -408,6 +442,7 @@ nagios:
     ladybug: 
       domain_full_suffix: dev.bitmask.net
       domain_internal: ladybug.dev.bitmask.i
+      environment: development
       ip_address: "199.119.112.8"
       services: 
         - backup
@@ -415,6 +450,7 @@ nagios:
     leech: 
       domain_full_suffix: demo.bitmask.net
       domain_internal: leech.demo.bitmask.i
+      environment: demo
       ip_address: "198.252.153.85"
       services: 
         - mx
@@ -422,6 +458,7 @@ nagios:
     millipede: 
       domain_full_suffix: demo.bitmask.net
       domain_internal: millipede.demo.bitmask.i
+      environment: demo
       ip_address: "198.252.153.83"
       openvpn_gateway_address: "198.252.153.84"
       services: 
@@ -430,6 +467,7 @@ nagios:
     octopus: 
       domain_full_suffix: unstable.bitmask.net
       domain_internal: octopus.unstable.bitmask.i
+      environment: unstable
       ip_address: "199.119.112.16"
       services: 
         - mx
@@ -437,6 +475,7 @@ nagios:
     panda: 
       domain_full_suffix: unstable.bitmask.net
       domain_internal: panda.unstable.bitmask.i
+      environment: unstable
       ip_address: "199.119.112.9"
       services: 
         - couchdb
@@ -445,6 +484,7 @@ nagios:
     seahorse: 
       domain_full_suffix: unstable.bitmask.net
       domain_internal: seahorse.unstable.bitmask.i
+      environment: unstable
       ip_address: "199.119.112.12"
       openvpn_gateway_address: "199.119.112.13"
       services: 
@@ -453,6 +493,7 @@ nagios:
     snail: 
       domain_full_suffix: dev.bitmask.net
       domain_internal: snail.dev.bitmask.i
+      environment: development
       ip_address: "176.53.69.14"
       openvpn_gateway_address: "176.53.69.19"
       services: 
@@ -461,6 +502,7 @@ nagios:
     starfish: 
       domain_full_suffix: dev.bitmask.net
       domain_internal: starfish.dev.bitmask.i
+      environment: development
       ip_address: "176.53.69.23"
       services: 
         - mx
@@ -468,6 +510,7 @@ nagios:
     thrips: 
       domain_full_suffix: demo.bitmask.net
       domain_internal: thrips.demo.bitmask.i
+      environment: demo
       ip_address: "204.13.164.162"
       services: 
         - couchdb
@@ -476,6 +519,7 @@ nagios:
     urchin: 
       domain_full_suffix: dev.bitmask.net
       domain_internal: urchin.dev.bitmask.i
+      environment: development
       ip_address: "176.53.69.21"
       services: 
         - couchdb
@@ -484,6 +528,7 @@ nagios:
     wallaby: 
       domain_full_suffix: demo.bitmask.net
       domain_internal: wallaby.demo.bitmask.i
+      environment: demo
       ip_address: "204.13.164.57"
       services: 
         - webapp
diff --git a/hiera/monitor1.yaml b/hiera/monitor1.yaml
index 5e93913..f449c6e 100644
--- a/hiera/monitor1.yaml
+++ b/hiera/monitor1.yaml
@@ -65,10 +65,33 @@ nagios:
     - demo.bitmask.i
     - dev.bitmask.i
     - unstable.bitmask.i
+  environments: 
+    clientdev: 
+      contact_emails: 
+        - sysdev@leap.se
+    default: 
+      contact_emails: 
+        - sysdev@leap.se
+    demo: 
+      contact_emails: 
+        - elijah@leap.se
+        - sysdev@leap.se
+    development: 
+      contact_emails: 
+        - micah@leap.se
+        - sysdev@leap.se
+    production: 
+      contact_emails: 
+        - sysdev@leap.se
+    unstable: 
+      contact_emails: 
+        - sysdev@leap.se
+        - varac@leap.se
   hosts: 
     couch1: 
       domain_full_suffix: bitmask.net
       domain_internal: couch1.bitmask.i
+      environment: local
       ip_address: "10.5.5.44"
       services: 
         - couchdb
@@ -77,6 +100,7 @@ nagios:
     couch2: 
       domain_full_suffix: bitmask.net
       domain_internal: couch2.bitmask.i
+      environment: local
       ip_address: "10.5.5.52"
       services: 
         - couchdb
@@ -85,6 +109,7 @@ nagios:
     monitor1: 
       domain_full_suffix: bitmask.net
       domain_internal: monitor1.bitmask.i
+      environment: local
       ip_address: "10.5.5.49"
       services: 
         - monitor
@@ -92,6 +117,7 @@ nagios:
     mx1: 
       domain_full_suffix: bitmask.net
       domain_internal: mx1.bitmask.i
+      environment: local
       ip_address: "10.5.5.51"
       services: 
         - mx
@@ -99,12 +125,14 @@ nagios:
     plain1: 
       domain_full_suffix: bitmask.net
       domain_internal: plain1.bitmask.i
+      environment: local
       ip_address: "10.5.5.53"
       services: []
       ssh_port: 22
     tor1: 
       domain_full_suffix: bitmask.net
       domain_internal: tor1.bitmask.i
+      environment: local
       ip_address: "10.5.5.50"
       services: 
         - tor
@@ -112,6 +140,7 @@ nagios:
     vpn1: 
       domain_full_suffix: bitmask.net
       domain_internal: vpn1.bitmask.i
+      environment: local
       ip_address: "10.5.5.45"
       openvpn_gateway_address: "10.5.5.46"
       services: 
@@ -120,6 +149,7 @@ nagios:
     web1: 
       domain_full_suffix: bitmask.net
       domain_internal: web1.bitmask.i
+      environment: local
       ip_address: "10.5.5.47"
       services: 
         - webapp