[puppet] Consolidate into one single rDNS zone

[Andrea Veri <averi src gnome org>]

commit 1db3c9e969014c66b6b74bcbb0ce30786b414645
Author: Andrea Veri <averi redhat com>
Date:   Fri Apr 5 17:31:49 2019 +0200

    Consolidate into one single rDNS zone

 .../nsd/files/internal_zones/2.31.172.in-addr.arpa | 30 ----------------------
 .../{1.31.172.in-addr.arpa => 31.172.in-addr.arpa} | 23 +++++++++++++++++
 modules/nsd/manifests/init.pp                      |  3 +--
 3 files changed, 24 insertions(+), 32 deletions(-)
---
diff --git a/modules/nsd/files/internal_zones/1.31.172.in-addr.arpa 
b/modules/nsd/files/internal_zones/31.172.in-addr.arpa
similarity index 69%
rename from modules/nsd/files/internal_zones/1.31.172.in-addr.arpa
rename to modules/nsd/files/internal_zones/31.172.in-addr.arpa
index 86e8b912..0396580f 100644
--- a/modules/nsd/files/internal_zones/1.31.172.in-addr.arpa
+++ b/modules/nsd/files/internal_zones/31.172.in-addr.arpa
@@ -10,6 +10,8 @@ $TTL          300
                 IN     NS      nsd03.gnome.org.
                 IN     NS      nsd04.gnome.org.
 
+$ORIGIN 1.31.172.in-addr.arpa.
+
 45              IN      PTR       bugzilla.gnome.org.
 61              IN      PTR       accelerator.gnome.org.
 49              IN      PTR       spinner.gnome.org.
@@ -36,3 +38,24 @@ $TTL         300
 78              IN      PTR       palette.gnome.org.
 79              IN      PTR       puppetmaster02.gnome.org.
 80              IN      PTR       gpm-builder.gnome.org.
+
+$ORIGIN 2.31.172.in-addr.arpa.
+
+1     IN    PTR scale.gnome.org. 
+2     IN    PTR gesture.gnome.org.
+4     IN    PTR sdkbuilder.gnome.org.
+5     IN    PTR nsd02.gnome.org.
+6     IN    PTR nsd03.gnome.org.
+7     IN    PTR unbound02.gnome.org.
+9     IN    PTR view.gnome.org.
+11    IN    PTR wiki.gnome.org.
+19    IN    PTR oscp-router01.gnome.org.
+16    IN    PTR oscp-router02.gnome.org.
+12    IN    PTR oscp-master01.gnome.org.
+13    IN    PTR oscp-master02.gnome.org.
+14    IN    PTR oscp-node01.gnome.org.
+15    IN    PTR oscp-node02.gnome.org.
+17    IN    PTR oscp-node03.gnome.org.
+18    IN    PTR oscp-node04.gnome.org.
+22    IN    PTR oscp-node05.gnome.org.
+20    IN    PTR oscp-master03.gnome.org.
diff --git a/modules/nsd/manifests/init.pp b/modules/nsd/manifests/init.pp
index 751e7fe2..a6390b14 100644
--- a/modules/nsd/manifests/init.pp
+++ b/modules/nsd/manifests/init.pp
@@ -68,8 +68,7 @@ class nsd {
               'socket.gnome.org',
               'signal.gnome.org',
               'log01.gnome.org',
-              '1.31.172.in-addr.arpa',
-              '2.31.172.in-addr.arpa',
+              '31.172.in-addr.arpa',
               '0.8.10.in-addr.arpa',
               'smtp-int.gnome.org',
               'splunk01.gnome.org',