start integrating enc2 blades into puppet

diff --git a/hieradata/clusters/ganeti4.debian.org.yaml b/hieradata/clusters/ganeti4.debian.org.yaml
new file mode 100644 (file)
index 0000000..aa306fb
--- /dev/null
+++ b/hieradata/clusters/ganeti4.debian.org.yaml
@@ -0,0 +1,6 @@
+---
+nodes:
+  - 'ubc-enc2bl1.debian.org'
+  - 'ubc-enc2bl2.debian.org'
+  - 'ubc-enc2bl9.debian.org'
+  - 'ubc-enc2bl10.debian.org'

diff --git a/hieradata/ubc.yaml b/hieradata/ubc.yaml
new file mode 100644 (file)
index 0000000..048cd8d
--- /dev/null
+++ b/hieradata/ubc.yaml
@@ -0,0 +1,19 @@
+---
+nameservers:
+  # ubc-bl2
+  - 206.12.19.212
+  - 2607:f8f0:610:4000:6564:a62:ce0c:13d4
+  # ubc-bl6
+  - 206.12.19.216
+  - 2607:f8f0:610:4000:6564:a62:ce0c:13d8
+  # ubc-bl8
+  - 206.12.19.218
+  - 2607:f8f0:610:4000:224:81ff:fef8:7cb8
+searchpaths:
+  - debprivate-ubc.debian.org
+  - ubc.priv.debian.org
+allow_dns_query:
+  - 206.12.19.0/24
+  - 209.87.16/24
+  - 2607:f8f0:610:4000::/64
+  - 2607:F8F0:614:1::/64

diff --git a/hieradata/ubcece.yaml b/hieradata/ubcece.yaml
index d94a4d9..048cd8d 100644 (file)
--- a/hieradata/ubcece.yaml
+++ b/hieradata/ubcece.yaml
@@ -11,7 +11,9 @@ nameservers:
   - 2607:f8f0:610:4000:224:81ff:fef8:7cb8
 searchpaths:
   - debprivate-ubc.debian.org
+  - ubc.priv.debian.org
 allow_dns_query:
-  - 137.82.84.64/27
   - 206.12.19.0/24
+  - 209.87.16/24
   - 2607:f8f0:610:4000::/64
+  - 2607:F8F0:614:1::/64

diff --git a/manifests/site.pp b/manifests/site.pp
index fa619fe..1b8eb19 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -49,7 +49,7 @@ node default {
                }
        }
 
-       if $::hostname in [ubc-bl7,ubc-bl3,ubc-bl2,ubc-bl6,ubc-bl8,ubc-bl4,byrd,clementi,czerny,bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,bm-bl9,bm-bl10,bm-bl11,bm-bl12,bm-bl13,bm-bl14,csail-node01,csail-node02,grnet-node01,grnet-node02] {
+       if $::hostname in [ubc-bl7,ubc-bl3,ubc-bl2,ubc-bl6,ubc-bl8,ubc-bl4,byrd,clementi,czerny,bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,bm-bl9,bm-bl10,bm-bl11,bm-bl12,bm-bl13,bm-bl14,csail-node01,csail-node02,grnet-node01,grnet-node02,ubc-enc2bl1,ubc-enc2bl2,ubc-enc2bl9,ubc-enc2bl10] {
                include ganeti2
        }
 

diff --git a/modules/debian-org/misc/hoster.yaml b/modules/debian-org/misc/hoster.yaml
index e486848..74f659f 100644 (file)
--- a/modules/debian-org/misc/hoster.yaml
+++ b/modules/debian-org/misc/hoster.yaml
@@ -165,11 +165,20 @@ sil:
   searchpaths: [priv.sil.debian.org]
   nameservers: []
   mirror-debian: http://ftp.at.debian.org/debian/
+ubc:
+  netrange:
+    - 209.87.16.0/24
+    - 2607:F8F0:614:1::/64
+  searchpaths: [priv.ubc.debian.org, debprivate-ubc.debian.org]
+  mirror-debian: http://mirror-ubc.debian.org/debian/
+  nameservers: ['206.12.19.212', # ubc-bl2
+                '206.12.19.216', # ubc-bl6
+                '206.12.19.218'] # ubc-bl8
 ubcece:
   netrange:
-    - 137.82.84.64/27
     - 206.12.19.0/24
-  searchpaths: [debprivate-ubc.debian.org]
+    - 2607:f8f0:610:4000::/64
+  searchpaths: [debprivate-ubc.debian.org, priv.ubc.debian.org]
   mirror-debian: http://mirror-ubc.debian.org/debian/
   nameservers: ['206.12.19.212', '2607:f8f0:610:4000:6564:a62:ce0c:13d4', # ubc-bl2
                 '206.12.19.216', '2607:f8f0:610:4000:6564:a62:ce0c:13d8', # ubc-bl6

diff --git a/modules/named/templates/named.conf.debian-zones.erb b/modules/named/templates/named.conf.debian-zones.erb
index 86fbf35..910735b 100644 (file)
--- a/modules/named/templates/named.conf.debian-zones.erb
+++ b/modules/named/templates/named.conf.debian-zones.erb
@@ -33,10 +33,16 @@ zones << "b.e.d.0.c.f.f.2.8.4.6.0.1.0.0.2.ip6.arpa"
 # ipv6 at 1&1 - wieck and schumann  - new range April 2011
 zones << "2.6.a.0.4.6.5.6.0.0.4.0.0.8.5.0.8.d.8.0.1.0.0.2.ip6.arpa"
 
-# 19.12.206.in-addr.arpa zone - reverse zone for 206.12.19/24 - debian at UBC/ECE
+# 16.87.209.in-addr.arpa zone - reverse zone for 209.87.16/24 - debian at UBC
+zones << "16.87.209.in-addr.arpa"
+
+# 1.0.0.0.4.1.6.0.0.f.8.f.7.0.6.2.ip6.arpa - reverse zone for 2607:f8f0:614:1::/64 - debian at UBC
+zones << "1.0.0.0.4.1.6.0.0.f.8.f.7.0.6.2.ip6.arpa"
+
+# 19.12.206.in-addr.arpa zone - reverse zone for 206.12.19/24 - debian at UBC ECE
 zones << "19.12.206.in-addr.arpa"
 
-# 0.0.0.4.0.1.6.0.0.f.8.f.7.0.6.2.ip6.arpa - reverse zone for 2607:f8f0:0610:4000::/64 - ubcece6
+# 0.0.0.4.0.1.6.0.0.f.8.f.7.0.6.2.ip6.arpa - reverse zone for 2607:f8f0:0610:4000::/64 - debian at UBC ECE
 zones << "0.0.0.4.0.1.6.0.0.f.8.f.7.0.6.2.ip6.arpa"
 
 # 0.0.0.0.5.0.0.0.8.7.a.0.1.0.0.2.ip6.arpa - reverse for 2001:a78:5:0::/64 (villa)