Merge pull request #1883 from lsst-it/IT-6457-merken_networking

(node/foreman.cp) add new dhcp for merken-fqdn and merken-metallb

Author: Gmaulen

hieradata/node/foreman.cp.lsst.org.yaml

@@ -46,6 +46,20 @@ dhcp::pools:
     range:
       - "139.229.161.40 139.229.161.42"
     search_domains: "%{alias('dhcp::dnsdomain')}"
+  MERKEN-FQDN:
+    network: "139.229.161.64"
+    mask: "255.255.255.240"
+    gateway: "139.229.161.78"
+    range:
+      - "139.229.161.65 139.229.161.75"
+    search_domains: "%{alias('dhcp::dnsdomain')}"
+  MERKEN-METALLB:
+    network: "139.229.161.80"
+    mask: "255.255.255.224"
+    gateway: "139.229.161.110"
+    range:
+      - "139.229.161.81 139.229.161.107"
+    search_domains: "%{alias('dhcp::dnsdomain')}"
   IT-BMC:
     network: "139.229.162.0"
     mask: "255.255.255.0"

spec/hosts/nodes/foreman.cp.lsst.org_spec.rb

@@ -362,6 +362,24 @@
           gateway: '10.18.5.254'
         )
       end
+
+      it do
+        is_expected.to contain_dhcp__pool('MERKEN-FQDN').with(
+          network: '139.229.161.64',
+          mask: '255.255.255.240',
+          range: ['139.229.161.65 139.229.161.75'],
+          gateway: '139.229.161.78'
+        )
+      end
+
+      it do
+        is_expected.to contain_dhcp__pool('MERKEN-METALLB').with(
+          network: '139.229.161.80',
+          mask: '255.255.255.224',
+          range: ['139.229.161.81 139.229.161.107'],
+          gateway: '139.229.161.110'
+        )
+      end
     end # on os
   end # on_supported_os
 end # role