Merge pull request #1886 from lsst-it/IT-6457-merken_network_dhcp

(foreman/cp) Add merken network dhcp

Author: gseriche

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

@@ -47,18 +47,18 @@ dhcp::pools:
       - "139.229.161.40 139.229.161.42"
     search_domains: "%{alias('dhcp::dnsdomain')}"
   MERKEN-FQDN:
-    network: "139.229.161.64"
+    network: "139.229.161.96"
     mask: "255.255.255.240"
-    gateway: "139.229.161.78"
+    gateway: "139.229.161.110"
     range:
-      - "139.229.161.65 139.229.161.75"
+      - "139.229.161.97 139.229.161.107"
     search_domains: "%{alias('dhcp::dnsdomain')}"
   MERKEN-METALLB:
-    network: "139.229.161.80"
+    network: "139.229.161.64"
     mask: "255.255.255.224"
-    gateway: "139.229.161.110"
+    gateway: "139.229.161.94"
     range:
-      - "139.229.161.81 139.229.161.107"
+      - "139.229.161.65 139.229.161.91"
     search_domains: "%{alias('dhcp::dnsdomain')}"
   IT-BMC:
     network: "139.229.162.0"

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

@@ -365,19 +365,19 @@
 
       it do
         is_expected.to contain_dhcp__pool('MERKEN-FQDN').with(
-          network: '139.229.161.64',
+          network: '139.229.161.96',
           mask: '255.255.255.240',
-          range: ['139.229.161.65 139.229.161.75'],
-          gateway: '139.229.161.78'
+          range: ['139.229.161.97 139.229.161.107'],
+          gateway: '139.229.161.110'
         )
       end
 
       it do
         is_expected.to contain_dhcp__pool('MERKEN-METALLB').with(
-          network: '139.229.161.80',
+          network: '139.229.161.64',
           mask: '255.255.255.224',
-          range: ['139.229.161.81 139.229.161.107'],
-          gateway: '139.229.161.110'
+          range: ['139.229.161.65 139.229.161.91'],
+          gateway: '139.229.161.94'
         )
       end
     end # on os