summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2014-12-10 20:30:03 +0100
committervarac <varacanero@zeromail.org>2014-12-10 20:30:03 +0100
commit273f135536132c3f4d6a6297b0ef23802fcfe2b5 (patch)
tree1e5c7b2d0cafc92eeae0437b8df8b01ac7528596
parent4a46ad67afd33d74701f48572b873ecd5fdcc079 (diff)
leap compile after changes from #6477
-rw-r--r--hiera/chameleon.yaml25
1 files changed, 25 insertions, 0 deletions
diff --git a/hiera/chameleon.yaml b/hiera/chameleon.yaml
index 8045d86..b5e369b 100644
--- a/hiera/chameleon.yaml
+++ b/hiera/chameleon.yaml
@@ -317,6 +317,7 @@ mail:
- octopus.unstable.bitmask.net
nagios:
domains_internal:
+ - bitmask.i
- cdev.bitmask.i
- demo.bitmask.i
- dev.bitmask.i
@@ -345,6 +346,7 @@ nagios:
ant:
domain_full_suffix: demo.bitmask.net
domain_internal: ant.demo.bitmask.i
+ domain_internal_suffix: demo.bitmask.i
environment: demo
ip_address: "198.252.153.82"
services:
@@ -353,6 +355,7 @@ nagios:
canvasback:
domain_full_suffix: cdev.bitmask.net
domain_internal: canvasback.cdev.bitmask.i
+ domain_internal_suffix: cdev.bitmask.i
environment: clientdev
ip_address: "199.119.112.4"
services:
@@ -361,6 +364,7 @@ nagios:
chameleon:
domain_full_suffix: unstable.bitmask.net
domain_internal: chameleon.unstable.bitmask.i
+ domain_internal_suffix: unstable.bitmask.i
environment: unstable
ip_address: "199.119.112.10"
services:
@@ -370,6 +374,7 @@ nagios:
chipmonk:
domain_full_suffix: cdev.bitmask.net
domain_internal: chipmonk.cdev.bitmask.i
+ domain_internal_suffix: cdev.bitmask.i
environment: clientdev
ip_address: "199.119.112.19"
services:
@@ -378,6 +383,7 @@ nagios:
clam:
domain_full_suffix: dev.bitmask.net
domain_internal: clam.dev.bitmask.i
+ domain_internal_suffix: dev.bitmask.i
environment: development
ip_address: "176.53.69.22"
services:
@@ -387,6 +393,7 @@ nagios:
deer:
domain_full_suffix: dev.bitmask.net
domain_internal: deer.dev.bitmask.i
+ domain_internal_suffix: dev.bitmask.i
environment: development
ip_address: "202.85.227.195"
services:
@@ -395,6 +402,7 @@ nagios:
demodex:
domain_full_suffix: dev.bitmask.net
domain_internal: demodex.dev.bitmask.i
+ domain_internal_suffix: dev.bitmask.i
environment: development
ip_address: "204.13.164.171"
services:
@@ -403,6 +411,7 @@ nagios:
elephant:
domain_full_suffix: dev.bitmask.net
domain_internal: elephant.dev.bitmask.i
+ domain_internal_suffix: dev.bitmask.i
environment: development
ip_address: "176.53.69.13"
services:
@@ -411,6 +420,7 @@ nagios:
elk:
domain_full_suffix: dev.bitmask.net
domain_internal: elk.dev.bitmask.i
+ domain_internal_suffix: dev.bitmask.i
environment: development
ip_address: "176.53.69.127"
services:
@@ -419,6 +429,7 @@ nagios:
frog:
domain_full_suffix: bitmask.net
domain_internal: frog.bitmask.i
+ domain_internal_suffix: bitmask.i
environment: production
ip_address: "199.119.112.23"
services:
@@ -427,6 +438,7 @@ nagios:
gadwall:
domain_full_suffix: cdev.bitmask.net
domain_internal: gadwall.cdev.bitmask.i
+ domain_internal_suffix: cdev.bitmask.i
environment: clientdev
ip_address: "199.119.112.5"
services:
@@ -436,6 +448,7 @@ nagios:
hippo:
domain_full_suffix: demo.bitmask.net
domain_internal: hippo.demo.bitmask.i
+ domain_internal_suffix: demo.bitmask.i
environment: demo
ip_address: "85.17.92.143"
openvpn_gateway_address: "85.17.92.167"
@@ -446,6 +459,7 @@ nagios:
ladybug:
domain_full_suffix: dev.bitmask.net
domain_internal: ladybug.dev.bitmask.i
+ domain_internal_suffix: dev.bitmask.i
environment: development
ip_address: "199.119.112.8"
services:
@@ -454,6 +468,7 @@ nagios:
leech:
domain_full_suffix: demo.bitmask.net
domain_internal: leech.demo.bitmask.i
+ domain_internal_suffix: demo.bitmask.i
environment: demo
ip_address: "198.252.153.85"
services:
@@ -462,6 +477,7 @@ nagios:
millipede:
domain_full_suffix: demo.bitmask.net
domain_internal: millipede.demo.bitmask.i
+ domain_internal_suffix: demo.bitmask.i
environment: demo
ip_address: "198.252.153.83"
openvpn_gateway_address: "198.252.153.84"
@@ -471,6 +487,7 @@ nagios:
octopus:
domain_full_suffix: unstable.bitmask.net
domain_internal: octopus.unstable.bitmask.i
+ domain_internal_suffix: unstable.bitmask.i
environment: unstable
ip_address: "199.119.112.16"
services:
@@ -479,6 +496,7 @@ nagios:
otter:
domain_full_suffix: demo.bitmask.net
domain_internal: otter.demo.bitmask.i
+ domain_internal_suffix: demo.bitmask.i
environment: demo
ip_address: "46.165.242.166"
openvpn_gateway_address: "46.165.242.169"
@@ -489,6 +507,7 @@ nagios:
panda:
domain_full_suffix: unstable.bitmask.net
domain_internal: panda.unstable.bitmask.i
+ domain_internal_suffix: unstable.bitmask.i
environment: unstable
ip_address: "199.119.112.9"
services:
@@ -498,6 +517,7 @@ nagios:
seahorse:
domain_full_suffix: unstable.bitmask.net
domain_internal: seahorse.unstable.bitmask.i
+ domain_internal_suffix: unstable.bitmask.i
environment: unstable
ip_address: "199.119.112.12"
openvpn_gateway_address: "199.119.112.13"
@@ -507,6 +527,7 @@ nagios:
snail:
domain_full_suffix: dev.bitmask.net
domain_internal: snail.dev.bitmask.i
+ domain_internal_suffix: dev.bitmask.i
environment: development
ip_address: "176.53.69.14"
openvpn_gateway_address: "176.53.69.19"
@@ -516,6 +537,7 @@ nagios:
starfish:
domain_full_suffix: dev.bitmask.net
domain_internal: starfish.dev.bitmask.i
+ domain_internal_suffix: dev.bitmask.i
environment: development
ip_address: "176.53.69.23"
services:
@@ -524,6 +546,7 @@ nagios:
thrips:
domain_full_suffix: demo.bitmask.net
domain_internal: thrips.demo.bitmask.i
+ domain_internal_suffix: demo.bitmask.i
environment: demo
ip_address: "204.13.164.162"
services:
@@ -533,6 +556,7 @@ nagios:
urchin:
domain_full_suffix: dev.bitmask.net
domain_internal: urchin.dev.bitmask.i
+ domain_internal_suffix: dev.bitmask.i
environment: development
ip_address: "176.53.69.21"
services:
@@ -542,6 +566,7 @@ nagios:
wallaby:
domain_full_suffix: demo.bitmask.net
domain_internal: wallaby.demo.bitmask.i
+ domain_internal_suffix: demo.bitmask.i
environment: demo
ip_address: "204.13.164.57"
services: