summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--hiera/chameleon.yaml32
-rw-r--r--hiera/chipmonk.yaml2
-rw-r--r--hiera/leech.yaml2
-rw-r--r--hiera/mx1.yaml2
-rw-r--r--hiera/octopus.yaml2
-rw-r--r--hiera/starfish.yaml2
6 files changed, 42 insertions, 0 deletions
diff --git a/hiera/chameleon.yaml b/hiera/chameleon.yaml
index 6538cb7..867b1d3 100644
--- a/hiera/chameleon.yaml
+++ b/hiera/chameleon.yaml
@@ -168,6 +168,12 @@ hosts:
host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBBGDhCu92zulHOAhv63sTLnxPQrP+GxbWC4YUxonYOiWKaI/oS5soH5vfgI0/kkzZgA044F6ZyWo5S5dEwz4AEI="
ip_address: "198.252.153.82"
port: 4422
+ armadillo:
+ domain_full: armadillo.bleeding.bitmask.net
+ domain_internal: armadillo.bleeding.bitmask.i
+ host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC/9xQU1KwCniVCHjGP52c0WXkh6L+ZkRR4Wq30cNIN5V1fYzBb2GdVaMBLNT68XFJHG7OrhC3HGsXLkEGyiCyHSNsvrMFBD4L3rx9R/RK8ORfgiKcjRjs8KQ9kGqCNYLYuhLf6HzqDkM3TAtfehTlymHsQjYZX7z+UWryAdghQMG8vQ8XONelvQ7I3iiHGtcxsv0lG8t5WUs4JOpiGuf/zrnz8M93M1PUnoJLi23YfR9Hs/kVHL84jCaalZ6AHRLD07oEkGvyIJghc8c8VMvYSngNHfjAmXQWhk1+J2CknJ6orVYLtoC+G82HlrAeISA7o41pO106JHSVdi2wuL32X"
+ ip_address: "1.209.122.24"
+ port: 22
canvasback:
domain_full: canvasback.cdev.bitmask.net
domain_internal: canvasback.cdev.bitmask.i
@@ -228,6 +234,12 @@ hosts:
host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBC4ycn7GabjeeewBmzTUbH+rZjRQV9seFmqbW2o5cE4jLsbPIMcMRRwLhA7TfIRLL7bLyuRNUWXwOqKZb/Psiog="
ip_address: "192.168.5.5"
port: 22
+ gorilla:
+ domain_full: gorilla.bleeding.bitmask.net
+ domain_internal: gorilla.bleeding.bitmask.i
+ host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAvgagCu3wyJizByW+JMLGn0CcMIDSxBU0QdBqcu65DDKOyJvVWL2fSHEOu0xdVmQow7ecoirrJZqL6VzrFVp8ur1Rn7+IR2RdtADtel4dbi7Hr1PuvNTKuE/NsRtX3p+zZHEl6SkFBVIgInlfezQxyytyLzL5mCjUCIe74krHDrU9bLkIwet3V/33SHjNYvv4BZ0VxCjvioI6iallhTw0ysizNFrbt3gyOCmS64E9qZWzYhzYUz8lF6nGpjNuwFcqrnZ0UN9Pk9905YuVAjO9H9kAIEKQ+bqAY0va8jcVC7NRKv3n5E7JFbr4SzSoOLulmkVDPRimax2XEt1fA8vr"
+ ip_address: "1.209.122.26"
+ port: 22
hippo:
domain_full: hippo.bitmask.net
domain_internal: hippo.bitmask.i
@@ -318,11 +330,15 @@ mail:
nagios:
domains_internal:
- bitmask.i
+ - bleeding.bitmask.i
- cdev.bitmask.i
- demo.bitmask.i
- dev.bitmask.i
- unstable.bitmask.i
environments:
+ bleeding:
+ contact_emails:
+ - sysdev@leap.se
clientdev:
contact_emails:
- drebs@leap.se
@@ -355,6 +371,14 @@ nagios:
services:
- couchdb
ssh_port: 4422
+ armadillo:
+ domain_full_suffix: bleeding.bitmask.net
+ domain_internal: armadillo.bleeding.bitmask.i
+ domain_internal_suffix: bleeding.bitmask.i
+ environment: bleeding
+ ip_address: "1.209.122.24"
+ services: []
+ ssh_port: 22
canvasback:
domain_full_suffix: cdev.bitmask.net
domain_internal: canvasback.cdev.bitmask.i
@@ -448,6 +472,14 @@ nagios:
- couchdb
- soledad
ssh_port: 22
+ gorilla:
+ domain_full_suffix: bleeding.bitmask.net
+ domain_internal: gorilla.bleeding.bitmask.i
+ domain_internal_suffix: bleeding.bitmask.i
+ environment: bleeding
+ ip_address: "1.209.122.26"
+ services: []
+ ssh_port: 22
hippo:
domain_full_suffix: bitmask.net
domain_internal: hippo.bitmask.i
diff --git a/hiera/chipmonk.yaml b/hiera/chipmonk.yaml
index d2b76c7..88727be 100644
--- a/hiera/chipmonk.yaml
+++ b/hiera/chipmonk.yaml
@@ -51,6 +51,8 @@ mail:
smarthost: []
mynetworks:
- "1.209.122.22"
+ - "1.209.122.24"
+ - "1.209.122.26"
- "176.53.69.13"
- "176.53.69.14"
- "176.53.69.21"
diff --git a/hiera/leech.yaml b/hiera/leech.yaml
index 4852b5e..41bba4d 100644
--- a/hiera/leech.yaml
+++ b/hiera/leech.yaml
@@ -63,6 +63,8 @@ mail:
smarthost: []
mynetworks:
- "1.209.122.22"
+ - "1.209.122.24"
+ - "1.209.122.26"
- "176.53.69.13"
- "176.53.69.14"
- "176.53.69.21"
diff --git a/hiera/mx1.yaml b/hiera/mx1.yaml
index 806b4c9..192bc74 100644
--- a/hiera/mx1.yaml
+++ b/hiera/mx1.yaml
@@ -55,6 +55,8 @@ mail:
smarthost: []
mynetworks:
- "1.209.122.22"
+ - "1.209.122.24"
+ - "1.209.122.26"
- "176.53.69.13"
- "176.53.69.14"
- "176.53.69.21"
diff --git a/hiera/octopus.yaml b/hiera/octopus.yaml
index 648a3e2..79b51e2 100644
--- a/hiera/octopus.yaml
+++ b/hiera/octopus.yaml
@@ -51,6 +51,8 @@ mail:
smarthost: []
mynetworks:
- "1.209.122.22"
+ - "1.209.122.24"
+ - "1.209.122.26"
- "176.53.69.13"
- "176.53.69.14"
- "176.53.69.21"
diff --git a/hiera/starfish.yaml b/hiera/starfish.yaml
index 7d938a9..51e4f30 100644
--- a/hiera/starfish.yaml
+++ b/hiera/starfish.yaml
@@ -75,6 +75,8 @@ mail:
smarthost: []
mynetworks:
- "1.209.122.22"
+ - "1.209.122.24"
+ - "1.209.122.26"
- "176.53.69.13"
- "176.53.69.14"
- "176.53.69.21"