diff --git a/ansible/vars/cluster-geometry.yml b/ansible/vars/cluster-geometry.yml
index 9b160f22c4b9feaec45ac700c0b76d09da083cc7..33c8eb4ad81abceb5344eb25460f696dab5de820 100644
--- a/ansible/vars/cluster-geometry.yml
+++ b/ansible/vars/cluster-geometry.yml
@@ -1,5 +1,5 @@
 ---
-cluster_name: vanir
+cluster_name: aesir
 
 lustre_client_version: 2.15.5
 lustre_client_kernel_version: 5.15.0-88
@@ -12,26 +12,25 @@ pmix_5_version: 5.0.4
 
 networks:
     external:
-      zone: vanir.wur.nl
-      subnet: 137.224.210.240/28
-      gateway: 137.224.210.241
+      zone: aesir.wurnet.nl
+      subnet: 10.90.10.0/25
+      gateway: 10.90.10.1
       type: ethernet
-      unmanaged: yes
     failover:
-      zone: failover.vanir.wur.nl
-      subnet: 192.168.8.0/23
+      zone: failover.aesir.wurnet.nl
+      subnet: 192.168.5.0/24
       type: ethernet
     ipmi:
-      zone: ipmi.vanir.wur.nl
+      zone: ipmi.aesir.wurnet.nl
       subnet: 192.168.56.0/23
       type: ethernet
     internal:
-      zone: internal.vanir.wur.nl
-      subnet: 192.168.100.0/23
+      zone: internal.aesir.wurnet.nl
+      subnet: 192.168.2.0/23
       type: ethernet
     infiniband:
-      zone: ib.vanir.wur.nl
-      subnet: 192.168.2.0/24
+      zone: ib.aesir.wurnet.nl
+      subnet: 192.168.32.0/23
       type: infiniband
       lnet:
         name: o2ib
@@ -50,12 +49,16 @@ networks:
           ntx: 512
           conns_per_peer: 4
         routes:
+          tcp:
+            gateway_types: [router]
+            hop: 0
+            priority: 0
           o2ib2:
             gateway_types: [router]
             hop: 1
             priority: 0
     omnipath:
-      zone: opa.vanir.wur.nl
+      zone: opa.aesir.wurnet.nl
       subnet: 192.168.34.0/23
       type: infiniband
       lnet:
@@ -84,39 +87,9 @@ networks:
             hop: 1
             priority: 0
     gige:
-      zone: gige.vanir.wur.nl
+      zone: gige.aesir.wurnet.nl
       subnet: 192.168.36.0/23
       type: ethernet
-      lnet:
-        name: tcp2
-        tunables:
-          peer_timeout: 0
-          peer_credits: 128
-          peer_buffer_credits: 0
-          credits: 1024
-        lnd tunables:
-          peercredits_hiw: 64
-          map_on_demand: 0
-          concurrent_sends: 128
-          fmr_pool_size: 512
-          fmr_flush_trigger: 384
-          fmr_cache: 1
-          ntx: 512
-          conns_per_peer: 4
-        routes:
-          o2ib:
-            gateway_types: [router]
-            hop: 1
-            priority: 0
-          o2ib2:
-            gateway_types: [router]
-            hop: 1
-            priority: 0
-    bif:
-      zone: internal.bioinformatics.nl
-      subnet: 192.168.50.0/24
-      unmanaged: yes
-      type: ethernet
       lnet:
         name: tcp
         tunables:
@@ -134,10 +107,6 @@ networks:
           ntx: 512
           conns_per_peer: 4
         routes:
-          tcp2:
-            gateway_types: [router]
-            hop: 1
-            priority: 0
           o2ib:
             gateway_types: [router]
             hop: 1
@@ -218,74 +187,68 @@ failover_network: failover
 external_network: external
 
 first_master:
-    name: vanir-master200
-    networks:
-      external:
-        interface: ens18
-        ip: 10.10.10.2/24
-        fqdn: "vanir-master200.{{ networks.external.zone }}"
-      internal:
-        interface: ens19
-        ip: "{{ networks.internal.subnet | ipaddr('509') | ipaddr('address') }}"
-        fqdn: "vanir-master200.{{ networks.internal.zone }}"
-      failover:
-        interface: ens20
-        ip: "{{ networks.failover.subnet | ipaddr('509') | ipaddr('address') }}"
-        fqdn: "vanir-master200.{{ networks.failover.zone }}"
-      ipmi:
-        interface: vlan.600
-        vlan:
-          id: 600
-          interface: ens21
-        ip: "{{ networks.ipmi.subnet | ipaddr('509') | ipaddr('address') }}"
-        fqdn: "vanir-master200.{{ networks.ipmi.zone }}"
-      omnipath:
-        interface: ens22
-        ip: "{{ networks.omnipath.subnet | ipaddr('509') | ipaddr('address') }}"
-        fqdn: "vanir-master200.{{ networks.omnipath.zone }}"
+  name: "{{cluster_name}}-master0"
+  networks:
+    external:
+      interface: eno1
+      ip: 10.90.10.8/25
+      fqdn: "{{cluster_name}}-master0.{{ networks.external.zone }}"
+    failover:
+      interface: eno2
+      ip: "{{ networks.failover.subnet | ipaddr('2') }}"
+      fqdn: "{{cluster_name}}-master0.{{ networks.failover.zone }}"
+    internal:
+      interface: eno3
+      ip: "{{ networks.internal.subnet | ipaddr('2') }}"
+      fqdn: "{{cluster_name}}-master0.{{ networks.internal.zone }}"
+    ipmi:
+      interface: eno4
+      ip: "{{ networks.oob.subnet | ipaddr('2') }}"
+      fqdn: "{{cluster_name}}-master0.{{ networks.oob.zone }}"
+    infiniband:
+      interface: ibs2f0
+      ip: "{{ networks.infiniband.subnet | ipaddr('2') }}"
+      fqdn: "{{cluster_name}}-master0.{{ networks.infiniband.zone }}"
 
 second_master:
-    name: vanir-master201
-    networks:
-      external:
-        interface: ens18
-        ip: 10.10.10.3/24
-        fqdn: "vanir-master201.{{ networks.external.zone }}"
-      internal:
-        interface: ens19
-        ip: "{{ networks.internal.subnet | ipaddr('510') | ipaddr('address') }}"
-        fqdn: "vanir-master201.{{ networks.internal.zone }}"
-      failover:
-        interface: ens20
-        ip: "{{ networks.failover.subnet | ipaddr('510') | ipaddr('address') }}"
-        fqdn: "vanir-master201.{{ networks.failover.zone }}"
-      ipmi:
-        interface: vlan.600
-        vlan:
-          id: 600
-          interface: ens21
-        ip: "{{ networks.ipmi.subnet | ipaddr('510') | ipaddr('address') }}"
-        fqdn: "vanir-master201.{{ networks.ipmi.zone }}"
-      omnipath:
-        interface: ens22
-        ip: "{{ networks.omnipath.subnet | ipaddr('510') | ipaddr('address') }}"
-        fqdn: "vanir-master201.{{ networks.omnipath.zone }}"
+  name: "{{cluster_name}}-master1"
+  networks:
+    external:
+      interface: eno1
+      ip: 10.90.10.9/25
+      fqdn: "{{cluster_name}}-master1.{{ networks.external.zone }}"
+    failover:
+      interface: eno2
+      ip: "{{ networks.failover.subnet | ipaddr('3') }}"
+      fqdn: "{{cluster_name}}-master1.{{ networks.failover.zone }}"
+    internal:
+      interface: eno3
+      ip: "{{ networks.internal.subnet | ipaddr('3') }}"
+      fqdn: "{{cluster_name}}-master1.{{ networks.internal.zone }}"
+    ipmi:
+      interface: eno4
+      ip: "{{ networks.oob.subnet | ipaddr('3') }}"
+      fqdn: "{{cluster_name}}-master1.{{ networks.oob.zone }}"
+    infiniband:
+      interface: ibs2f1
+      ip: "{{ networks.infiniband.subnet | ipaddr('3') }}"
+      fqdn: "{{cluster_name}}-master1.{{ networks.infiniband.zone }}"
 
 shared_master:
-    name: vanir-master
-    networks:
-      external:
-        ip: 10.10.10.4/24
-        fqdn: "vanir-master.{{ networks.external.zone }}"
-      ipmi:
-        ip: "{{ networks.ipmi.subnet | ipaddr('508') | ipaddr('address') }}"
-        fqdn: "vanir-master.{{ networks.ipmi.zone }}"
-      internal:
-        ip: "{{ networks.internal.subnet | ipaddr('508') | ipaddr('address') }}"
-        fqdn: "vanir-master.{{ networks.internal.zone }}"
-      omnipath:
-        ip: "{{ networks.omnipath.subnet | ipaddr('508') | ipaddr('address') }}"
-        fqdn: "vanir-master.{{ networks.omnipath.zone }}"
+  name: "{{cluster_name}}-master"
+  networks:
+    external:
+      ip: 10.90.10.10/25
+      fqdn: "{{cluster_name}}-master.{{ networks.external.zone }}"
+    oob:
+      ip: "{{ networks.oob.subnet | ipaddr('1') }}"
+      fqdn: "{{cluster_name}}-master.{{ networks.oob.zone }}"
+    internal:
+      ip: "{{ networks.internal.subnet | ipaddr('1') }}"
+      fqdn: "{{cluster_name}}-master.{{ networks.internal.zone }}"
+    infiniband:
+      ip: "{{ networks.infiniband.subnet | ipaddr('1') }}"
+      fqdn: "{{cluster_name}}-master.{{ networks.infiniband.zone }}"
 
 ntp_servers:
   - "ntp-dmz-01.wurnet.nl iburst"
@@ -321,915 +284,803 @@ vulnerability_scanner_ip: 10.193.57.4/32
 dns_forwarders: "10.124.10.11; 10.124.10.12;"
 dns_search: "{{networks.internal.zone}} {{networks.ipmi.zone}} {{networks.infiniband.zone}} {{networks.omnipath.zone}} {{networks.gige.zone}} wurnet.nl wur.nl"
 nodes:
-  - {name: stack0, ip: "{{ networks.ipmi.subnet | ipaddr('232') | ipaddr('address') }}", single_ip: yes}
-  - {name: stack1, ip: "{{ networks.ipmi.subnet | ipaddr('233') | ipaddr('address') }}", single_ip: yes}
-  - {name: ib-5ed3b6, ip: "{{ networks.ipmi.subnet | ipaddr('119') | ipaddr('address') }}", single_ip: yes}
-  - {name: ib-b7b770, ip: "{{ networks.ipmi.subnet | ipaddr('112') | ipaddr('address') }}", single_ip: yes}
-  - {name: ib-b7ba08, ip: "{{ networks.ipmi.subnet | ipaddr('113') | ipaddr('address') }}", single_ip: yes}
-  - {name: ib-b7bb38, ip: "{{ networks.ipmi.subnet | ipaddr('115') | ipaddr('address') }}", single_ip: yes}
-  - {name: ib-b7bb80, ip: "{{ networks.ipmi.subnet | ipaddr('114') | ipaddr('address') }}", single_ip: yes}
-  - {name: ib-b7c778, ip: "{{ networks.ipmi.subnet | ipaddr('117') | ipaddr('address') }}", single_ip: yes}
-  - {name: ib-b7c7e8, ip: "{{ networks.ipmi.subnet | ipaddr('116') | ipaddr('address') }}", single_ip: yes}
-  - {name: ib-b7c8a0, ip: "{{ networks.ipmi.subnet | ipaddr('118') | ipaddr('address') }}", single_ip: yes}
-
-  - {name: OPA-00117501ff0ba138, ip: "{{ networks.ipmi.subnet | ipaddr('56') | ipaddr('address') }}", single_ip: yes}
-  - {name: OPA-00117501ff0ba1ae, ip: "{{ networks.ipmi.subnet | ipaddr('57') | ipaddr('address') }}", single_ip: yes}
-  - {name: OPA-00117501ff0ba460, ip: "{{ networks.ipmi.subnet | ipaddr('58') | ipaddr('address') }}", single_ip: yes}
-  - {name: OPA-00117501ff0b9123, ip: "{{ networks.ipmi.subnet | ipaddr('59') | ipaddr('address') }}", single_ip: yes}
-  - {name: OPA-00117501ff0ba1a8, ip: "{{ networks.ipmi.subnet | ipaddr('60') | ipaddr('address') }}", single_ip: yes}
-  - {name: OPA-00117501ff0ba299, ip: "{{ networks.ipmi.subnet | ipaddr('61') | ipaddr('address') }}", single_ip: yes}
-  - {name: OPA-00117501ff0b904f, ip: "{{ networks.ipmi.subnet | ipaddr('62') | ipaddr('address') }}", single_ip: yes}
-  - {name: OPA-00117501ff0ba197, ip: "{{ networks.ipmi.subnet | ipaddr('63') | ipaddr('address') }}", single_ip: yes}
-  - {name: TOR-K13, ip: "{{ networks.ipmi.subnet | ipaddr('1') | ipaddr('address') }}", single_ip: yes}
-  - {name: TOR-K14, ip: "{{ networks.ipmi.subnet | ipaddr('2') | ipaddr('address') }}", single_ip: yes}
-  - {name: TOR-K15, ip: "{{ networks.ipmi.subnet | ipaddr('3') | ipaddr('address') }}", single_ip: yes}
-  - {name: TOR-K16, ip: "{{ networks.ipmi.subnet | ipaddr('4') | ipaddr('address') }}", single_ip: yes}
-  - {name: TOR-L11, ip: "{{ networks.ipmi.subnet | ipaddr('5') | ipaddr('address') }}", single_ip: yes}
-  - {name: TOR-L13, ip: "{{ networks.ipmi.subnet | ipaddr('6') | ipaddr('address') }}", single_ip: yes}
-  - {name: TOR-L14, ip: "{{ networks.ipmi.subnet | ipaddr('7') | ipaddr('address') }}", single_ip: yes}
-  - {name: TOR-L15, ip: "{{ networks.ipmi.subnet | ipaddr('8') | ipaddr('address') }}", single_ip: yes}
-  - {name: TOR-L17, ip: "{{ networks.ipmi.subnet | ipaddr('9') | ipaddr('address') }}", single_ip: yes}
-
-#  - {name: md3420-MDT0-a, ip: "{{ networks.ipmi.subnet | ipaddr('96') | ipaddr('address') }}", single_ip: yes}
-#  - {name: md3420-MDT0-b, ip: "{{ networks.ipmi.subnet | ipaddr('97') | ipaddr('address') }}", single_ip: yes}
-#  - {name: md3460-OST0-a, ip: "{{ networks.ipmi.subnet | ipaddr('98') | ipaddr('address') }}", single_ip: yes}
-#  - {name: md3460-OST0-b, ip: "{{ networks.ipmi.subnet | ipaddr('99') | ipaddr('address') }}", single_ip: yes}
-#  - {name: md3460-OST1-a, ip: "{{ networks.ipmi.subnet | ipaddr('100') | ipaddr('address') }}", single_ip: yes}
-#  - {name: md3460-OST1-b, ip: "{{ networks.ipmi.subnet | ipaddr('101') | ipaddr('address') }}", single_ip: yes}
-#  - {name: md3460-OST2-a, ip: "{{ networks.ipmi.subnet | ipaddr('102') | ipaddr('address') }}", single_ip: yes}
-#  - {name: md3460-OST2-b, ip: "{{ networks.ipmi.subnet | ipaddr('103') | ipaddr('address') }}", single_ip: yes}
-#  - {name: md3460-OST3-a, ip: "{{ networks.ipmi.subnet | ipaddr('104') | ipaddr('address') }}", single_ip: yes}
-#  - {name: md3460-OST3-b, ip: "{{ networks.ipmi.subnet | ipaddr('105') | ipaddr('address') }}", single_ip: yes}
-#  - {name: md3460-OST4-a, ip: "{{ networks.ipmi.subnet | ipaddr('106') | ipaddr('address') }}", single_ip: yes}
-#  - {name: md3460-OST4-b, ip: "{{ networks.ipmi.subnet | ipaddr('107') | ipaddr('address') }}", single_ip: yes}
-#  - {name: md3460-OST5-a, ip: "{{ networks.ipmi.subnet | ipaddr('108') | ipaddr('address') }}", single_ip: yes}
-#  - {name: md3460-OST5-b, ip: "{{ networks.ipmi.subnet | ipaddr('109') | ipaddr('address') }}", single_ip: yes}
-#  - {name: me4084-OST6-a, ip: "{{ networks.ipmi.subnet | ipaddr('176') | ipaddr('address') }}", single_ip: yes}
-#  - {name: me4084-OST6-b, ip: "{{ networks.ipmi.subnet | ipaddr('177') | ipaddr('address') }}", single_ip: yes}
-#  - {name: me4084-OST7-a, ip: "{{ networks.ipmi.subnet | ipaddr('178') | ipaddr('address') }}", single_ip: yes}
-#  - {name: me4084-OST7-b, ip: "{{ networks.ipmi.subnet | ipaddr('179') | ipaddr('address') }}", single_ip: yes}
-#  - {name: me4084-OST8-a, ip: "{{ networks.ipmi.subnet | ipaddr('182') | ipaddr('address') }}", single_ip: yes}
-#  - {name: me4084-OST8-b, ip: "{{ networks.ipmi.subnet | ipaddr('183') | ipaddr('address') }}", single_ip: yes}
-#  - {name: me4084-OST9-a, ip: "{{ networks.ipmi.subnet | ipaddr('184') | ipaddr('address') }}", single_ip: yes}
-#  - {name: me4084-OST9-b, ip: "{{ networks.ipmi.subnet | ipaddr('185') | ipaddr('address') }}", single_ip: yes}
-  - {name: me4084-shared0-a, ip: "{{ networks.ipmi.subnet | ipaddr('192') | ipaddr('address') }}", single_ip: yes}
-  - {name: me4084-shared0-b, ip: "{{ networks.ipmi.subnet | ipaddr('193') | ipaddr('address') }}", single_ip: yes}
-
-  - {name: me5084-OST200-a, ip: "{{ networks.ipmi.subnet | ipaddr('32') | ipaddr('address') }}", single_ip: yes}
-  - {name: me5084-OST200-b, ip: "{{ networks.ipmi.subnet | ipaddr('33') | ipaddr('address') }}", single_ip: yes}
-  - {name: me5084-OST201-a, ip: "{{ networks.ipmi.subnet | ipaddr('34') | ipaddr('address') }}", single_ip: yes}
-  - {name: me5084-OST202-b, ip: "{{ networks.ipmi.subnet | ipaddr('35') | ipaddr('address') }}", single_ip: yes}
-  - {name: me5084-OST202-a, ip: "{{ networks.ipmi.subnet | ipaddr('36') | ipaddr('address') }}", single_ip: yes}
-  - {name: me5084-OST202-b, ip: "{{ networks.ipmi.subnet | ipaddr('37') | ipaddr('address') }}", single_ip: yes}
-  - {name: me5084-OST203-a, ip: "{{ networks.ipmi.subnet | ipaddr('38') | ipaddr('address') }}", single_ip: yes}
-  - {name: me5084-OST203-b, ip: "{{ networks.ipmi.subnet | ipaddr('39') | ipaddr('address') }}", single_ip: yes}
-  - {name: me5084-OST204-a, ip: "{{ networks.ipmi.subnet | ipaddr('40') | ipaddr('address') }}", single_ip: yes}
-  - {name: me5084-OST204-b, ip: "{{ networks.ipmi.subnet | ipaddr('41') | ipaddr('address') }}", single_ip: yes}
-  - {name: me5084-OST205-a, ip: "{{ networks.ipmi.subnet | ipaddr('42') | ipaddr('address') }}", single_ip: yes}
-  - {name: me5084-OST205-b, ip: "{{ networks.ipmi.subnet | ipaddr('43') | ipaddr('address') }}", single_ip: yes}
-  - {name: me5084-OST206-a, ip: "{{ networks.ipmi.subnet | ipaddr('44') | ipaddr('address') }}", single_ip: yes}
-  - {name: me5084-OST206-b, ip: "{{ networks.ipmi.subnet | ipaddr('45') | ipaddr('address') }}", single_ip: yes}
-  - {name: me5084-OST207-a, ip: "{{ networks.ipmi.subnet | ipaddr('46') | ipaddr('address') }}", single_ip: yes}
-  - {name: me5084-OST207-b, ip: "{{ networks.ipmi.subnet | ipaddr('47') | ipaddr('address') }}", single_ip: yes}
-  - {name: me5024-MDT200-a, ip: "{{ networks.ipmi.subnet | ipaddr('54') | ipaddr('address') }}", single_ip: yes}
-  - {name: me5024-MDT200-b, ip: "{{ networks.ipmi.subnet | ipaddr('55') | ipaddr('address') }}", single_ip: yes}
-
-  - {name: scomp5826, ip: "{{ networks.ipmi.subnet | ipaddr('210') | ipaddr('address') }}", single_ip: yes}
-  - {name: scomp3127, ip: "{{ networks.ipmi.subnet | ipaddr('180') | ipaddr('address') }}", single_ip: yes}
-  - {name: scomp1387, ip: "{{ networks.infiniband.subnet | ipaddr('170') | ipaddr('address') }}", single_ip: yes}
-# ME4084 scomp1387 10.193.233.118
-# ME4084 scomp1387 10.193.233.119
-# MD3460 scomp1387 10.193.233.111
-# MD3460 scomp1387 10.193.233.112
-# scomp1387 idrac  10.193.233.121
+  - {name: stack0, ip: 192.168.1.232, single_ip: yes}
+  - {name: stack1, ip: 192.168.1.233, single_ip: yes}
+  - {name: ib-5ed3b6, ip: 192.168.1.119, single_ip: yes}
+  - {name: ib-b7b770, ip: 192.168.1.112, single_ip: yes}
+  - {name: ib-b7ba08, ip: 192.168.1.113, single_ip: yes}
+  - {name: ib-b7bb38, ip: 192.168.1.115, single_ip: yes}
+  - {name: ib-b7bb80, ip: 192.168.1.114, single_ip: yes}
+  - {name: ib-b7c778, ip: 192.168.1.117, single_ip: yes}
+  - {name: ib-b7c7e8, ip: 192.168.1.116, single_ip: yes}
+  - {name: ib-b7c8a0, ip: 192.168.1.118, single_ip: yes}
 
-#  - {name: master0-idrac, ip: "{{ networks.ipmi.subnet | ipaddr('253') | ipaddr('address') }}", single_ip: yes}
-#  - {name: master1-idrac, ip: "{{ networks.ipmi.subnet | ipaddr('254') | ipaddr('address') }}", single_ip: yes}
+  - {name: OPA-00117501ff0ba138, ip: 192.168.16.56, single_ip: yes}
+  - {name: OPA-00117501ff0ba1ae, ip: 192.168.16.57, single_ip: yes}
+  - {name: OPA-00117501ff0ba460, ip: 192.168.16.58, single_ip: yes}
+  - {name: OPA-00117501ff0b9123, ip: 192.168.16.59, single_ip: yes}
+  - {name: OPA-00117501ff0ba1a8, ip: 192.168.16.60, single_ip: yes}
+  - {name: OPA-00117501ff0ba299, ip: 192.168.16.61, single_ip: yes}
+  - {name: OPA-00117501ff0b904f, ip: 192.168.16.62, single_ip: yes}
+  - {name: OPA-00117501ff0ba197, ip: 192.168.16.63, single_ip: yes}
+  - {name: TOR-K13, ip: 192.168.16.1, single_ip: yes}
+  - {name: TOR-K14, ip: 192.168.16.2, single_ip: yes}
+  - {name: TOR-K15, ip: 192.168.16.3, single_ip: yes}
+  - {name: TOR-K16, ip: 192.168.16.4, single_ip: yes}
+  - {name: TOR-L11, ip: 192.168.16.5, single_ip: yes}
+  - {name: TOR-L13, ip: 192.168.16.6, single_ip: yes}
+  - {name: TOR-L14, ip: 192.168.16.7, single_ip: yes}
+  - {name: TOR-L15, ip: 192.168.16.8, single_ip: yes}
+  - {name: TOR-L17, ip: 192.168.16.9, single_ip: yes}
 
-#  - {name: mds0, ip: "{{ networks.internal.subnet | ipaddr('236') | ipaddr('address') }}"}
-#  - {name: mds1, ip: "{{ networks.internal.subnet | ipaddr('237') | ipaddr('address') }}"}
-#  - {name: oss00, ip: "{{ networks.internal.subnet | ipaddr('200') | ipaddr('address') }}"}
-#  - {name: oss01, ip: "{{ networks.internal.subnet | ipaddr('201') | ipaddr('address') }}"}
-#  - {name: oss02, ip: "{{ networks.internal.subnet | ipaddr('202') | ipaddr('address') }}"}
-#  - {name: oss03, ip: "{{ networks.internal.subnet | ipaddr('203') | ipaddr('address') }}"}
-#  - {name: oss04, ip: "{{ networks.internal.subnet | ipaddr('204') | ipaddr('address') }}"}
-#  - {name: oss05, ip: "{{ networks.internal.subnet | ipaddr('205') | ipaddr('address') }}"}
-#  - {name: oss06, ip: "{{ networks.internal.subnet | ipaddr('206') | ipaddr('address') }}"}
-#  - {name: oss07, ip: "{{ networks.internal.subnet | ipaddr('207') | ipaddr('address') }}"}
-#  - {name: oss08, ip: "{{ networks.internal.subnet | ipaddr('208') | ipaddr('address') }}"}
-#  - {name: oss09, ip: "{{ networks.internal.subnet | ipaddr('209') | ipaddr('address') }}"}
-#  - {name: router0, ip: "{{ networks.internal.subnet | ipaddr('244') | ipaddr('address') }}"}
+  - {name: md3420-MDT0-a, ip: 192.168.1.96, single_ip: yes}
+  - {name: md3420-MDT0-b, ip: 192.168.1.97, single_ip: yes}
+  - {name: md3460-OST0-a, ip: 192.168.1.98, single_ip: yes}
+  - {name: md3460-OST0-b, ip: 192.168.1.99, single_ip: yes}
+  - {name: md3460-OST1-a, ip: 192.168.1.100, single_ip: yes}
+  - {name: md3460-OST1-b, ip: 192.168.1.101, single_ip: yes}
+  - {name: md3460-OST2-a, ip: 192.168.1.102, single_ip: yes}
+  - {name: md3460-OST2-b, ip: 192.168.1.103, single_ip: yes}
+  - {name: md3460-OST3-a, ip: 192.168.1.104, single_ip: yes}
+  - {name: md3460-OST3-b, ip: 192.168.1.105, single_ip: yes}
+  - {name: md3460-OST4-a, ip: 192.168.1.106, single_ip: yes}
+  - {name: md3460-OST4-b, ip: 192.168.1.107, single_ip: yes}
+  - {name: md3460-OST5-a, ip: 192.168.1.108, single_ip: yes}
+  - {name: md3460-OST5-b, ip: 192.168.1.109, single_ip: yes}
+  - {name: me4084-OST6-a, ip: 192.168.1.176, single_ip: yes}
+  - {name: me4084-OST6-b, ip: 192.168.1.177, single_ip: yes}
+  - {name: me4084-OST7-a, ip: 192.168.1.178, single_ip: yes}
+  - {name: me4084-OST7-b, ip: 192.168.1.179, single_ip: yes}
+  - {name: me4084-OST8-a, ip: 192.168.1.182, single_ip: yes}
+  - {name: me4084-OST8-b, ip: 192.168.1.183, single_ip: yes}
+  - {name: me4084-OST9-a, ip: 192.168.1.184, single_ip: yes}
+  - {name: me4084-OST9-b, ip: 192.168.1.185, single_ip: yes}
+  - {name: me4084-shared0-a, ip: 192.168.1.192, single_ip: yes}
+  - {name: me4084-shared0-b, ip: 192.168.1.193, single_ip: yes}
 
-#  - {name: scratch0, ip: "{{ networks.internal.subnet | ipaddr('49') | ipaddr('address') }}"}
-#  - {name: scratch1, ip: "{{ networks.internal.subnet | ipaddr('50') | ipaddr('address') }}"}
-#  - {name: scratch2, ip: "{{ networks.internal.subnet | ipaddr('51') | ipaddr('address') }}"}
-#  - {name: scratch3, ip: "{{ networks.internal.subnet | ipaddr('52') | ipaddr('address') }}"}
+  - {name: me5084-OST200-a, ip: 192.168.16.32, single_ip: yes}
+  - {name: me5084-OST200-b, ip: 192.168.16.33, single_ip: yes}
+  - {name: me5084-OST201-a, ip: 192.168.16.34, single_ip: yes}
+  - {name: me5084-OST202-b, ip: 192.168.16.35, single_ip: yes}
+  - {name: me5084-OST202-a, ip: 192.168.16.36, single_ip: yes}
+  - {name: me5084-OST202-b, ip: 192.168.16.37, single_ip: yes}
+  - {name: me5084-OST203-a, ip: 192.168.16.38, single_ip: yes}
+  - {name: me5084-OST203-b, ip: 192.168.16.39, single_ip: yes}
+  - {name: me5084-OST204-a, ip: 192.168.16.40, single_ip: yes}
+  - {name: me5084-OST204-b, ip: 192.168.16.41, single_ip: yes}
+  - {name: me5084-OST205-a, ip: 192.168.16.42, single_ip: yes}
+  - {name: me5084-OST205-b, ip: 192.168.16.43, single_ip: yes}
+  - {name: me5084-OST206-a, ip: 192.168.16.44, single_ip: yes}
+  - {name: me5084-OST206-b, ip: 192.168.16.45, single_ip: yes}
+  - {name: me5084-OST207-a, ip: 192.168.16.46, single_ip: yes}
+  - {name: me5084-OST207-b, ip: 192.168.16.47, single_ip: yes}
+  - {name: me5024-MDT200-a, ip: 192.168.16.54, single_ip: yes}
+  - {name: me5024-MDT200-b, ip: 192.168.16.55, single_ip: yes}
 
-  - {name: mds200, ip: "{{ networks.internal.subnet | ipaddr('120') | ipaddr('address') }}"}
-  - {name: mds201, ip: "{{ networks.internal.subnet | ipaddr('121') | ipaddr('address') }}"}
-  - {name: oss200, ip: "{{ networks.internal.subnet | ipaddr('216') | ipaddr('address') }}"}
-  - {name: oss201, ip: "{{ networks.internal.subnet | ipaddr('217') | ipaddr('address') }}"}
-  - {name: oss202, ip: "{{ networks.internal.subnet | ipaddr('218') | ipaddr('address') }}"}
-  - {name: oss203, ip: "{{ networks.internal.subnet | ipaddr('219') | ipaddr('address') }}"}
-  - {name: oss204, ip: "{{ networks.internal.subnet | ipaddr('220') | ipaddr('address') }}"}
-  - {name: oss205, ip: "{{ networks.internal.subnet | ipaddr('221') | ipaddr('address') }}"}
-  - {name: oss206, ip: "{{ networks.internal.subnet | ipaddr('222') | ipaddr('address') }}"}
-  - {name: oss207, ip: "{{ networks.internal.subnet | ipaddr('223') | ipaddr('address') }}"}
+  - {name: scomp5826, ip: 192.168.1.210, single_ip: yes}
+  - {name: scomp3127, ip: 192.168.1.180, single_ip: yes}
+  - {name: scomp1387, ip: 192.168.2.170, single_ip: yes}
+#ME4084 scomp1387 10.193.233.118
+#ME4084 scomp1387 10.193.233.119
+#MD3460 scomp1387 10.193.233.111
+#MD3460 scomp1387 10.193.233.112
+#scomp1387 idrac  10.193.233.121
 
-  - {name: doudna, ip: "192.168.50.7", single_ip: yes}
-  - {name: woese, ip: "192.168.50.8", single_ip: yes}
-  - {name: kimura, ip: "192.168.50.9", single_ip: yes}
-  - {name: pevzner, ip: "192.168.50.13", single_ip: yes}
-  - {name: myers, ip: "192.168.50.14", single_ip: yes}
-  - {name: altschul, ip: "192.168.50.16", single_ip: yes}
-  - {name: smith, ip: "192.168.50.18", single_ip: yes}
-  - {name: waterman, ip: "192.168.50.19", single_ip: yes}
-  - {name: fisher, ip: "192.168.50.20", single_ip: yes}
-  - {name: eddy, ip: "192.168.50.22", single_ip: yes}
-  - {name: hogeweg, ip: "192.168.50.23", single_ip: yes}
-  - {name: franklin, ip: "192.168.50.24", single_ip: yes}
-  - {name: bork, ip: "192.168.50.25", single_ip: yes}
-  - {name: leunissen, ip: "192.168.50.26", single_ip: yes}
-  - {name: thornton, ip: "192.168.50.27", single_ip: yes}
-  - {name: lecun, ip: "192.168.50.28", single_ip: yes}
-  - {name: merian, ip: "192.168.50.29", single_ip: yes}
-  - {name: craighead, ip: "192.168.50.36", single_ip: yes}
-  - {name: dayhoff, ip: "192.168.50.41", single_ip: yes}
-  - {name: handelsman, ip: "192.168.50.42", single_ip: yes}
-  - {name: router200, ip: "192.168.50.122", single_ip: yes}
-  - {name: router201, ip: "192.168.50.123", single_ip: yes}
+  - {name: master0-idrac, ip: 192.168.16.250, single_ip: yes}
+  - {name: master1-idrac, ip: 192.168.16.251, single_ip: yes}
 
-# archive
-  - name: archive200
-    mac: 78:AC:44:47:EA:6C
-    ip: "{{ networks.internal.subnet | ipaddr('208') | ipaddr('address') }}"
-  - name: ARCHIVE-01-A
-    ip: "{{ networks.ipmi.subnet | ipaddr('182') | ipaddr('address') }}"
-  - name: ARCHIVE-01-B
-    ip: "{{ networks.ipmi.subnet | ipaddr('183') | ipaddr('address') }}"
-  - name: ARCHIVE-02-A
-    ip: "{{ networks.ipmi.subnet | ipaddr('184') | ipaddr('address') }}"
-  - name: ARCHIVE-02-B
-    ip: "{{ networks.ipmi.subnet | ipaddr('185') | ipaddr('address') }}"
-
-  - name: CDU-K14
-    mac: B8:27:EB:AD:27:99
-    ip: "{{ networks.ipmi.subnet | ipaddr('238') | ipaddr('address') }}"
-  - name: CDU-L14
-    mac: B8:27:EB:8A:DB:88
-    ip: "{{ networks.ipmi.subnet | ipaddr('239') | ipaddr('address') }}"
-
-#  - name: backup200ipmi
-#    mac: EC:2A:72:4A:55:E0
-#    ip: "{{ networks.ipmi.subnet | ipaddr('249') | ipaddr('address') }}"
-
-  - name: backup200
-    mac: EC:2A:72:46:64:D6
-    ip: "{{ networks.internal.subnet | ipaddr('505') | ipaddr('address') }}"
-
-# test PVE install on login1 hardware
-  - name: pvetest01
-    mac: E4:43:4B:0B:EA:C8
-    ip: "{{ networks.internal.subnet | ipaddr('230') | ipaddr('address') }}"
+  - {name: mds0, ip: 192.168.0.236}
+  - {name: mds1, ip: 192.168.0.237}
+  - {name: oss00, ip: 192.168.0.200}
+  - {name: oss01, ip: 192.168.0.201}
+  - {name: oss02, ip: 192.168.0.202}
+  - {name: oss03, ip: 192.168.0.203}
+  - {name: oss04, ip: 192.168.0.204}
+  - {name: oss05, ip: 192.168.0.205}
+  - {name: oss06, ip: 192.168.0.206}
+  - {name: oss07, ip: 192.168.0.207}
+  - {name: oss08, ip: 192.168.0.208}
+  - {name: oss09, ip: 192.168.0.209}
+  - {name: router0, ip: 192.168.0.244}
 
-# clc VM (test-phase)
-  - name: app-clc
-    mac: BC:24:11:4E:E8:F3
-    ip: "{{ networks.internal.subnet | ipaddr('231') | ipaddr('address') }}"
+  - {name: scratch0, ip: 192.168.0.49}
+  - {name: scratch1, ip: 192.168.0.50}
+  - {name: scratch2, ip: 192.168.0.51}
+  - {name: scratch3, ip: 192.168.0.52}
 
-  - name: app-myhpc
-    mac: BC:24:11:60:21:B2
-    ip: "{{ networks.internal.subnet | ipaddr('232') | ipaddr('address') }}"
+  - {name: mds200, ip: 192.168.0.120}
+  - {name: mds201, ip: 192.168.0.121}
+  - {name: oss200, ip: 192.168.0.216}
+  - {name: oss201, ip: 192.168.0.217}
+  - {name: oss202, ip: 192.168.0.218}
+  - {name: oss203, ip: 192.168.0.219}
+  - {name: oss204, ip: 192.168.0.220}
+  - {name: oss205, ip: 192.168.0.221}
+  - {name: oss206, ip: 192.168.0.222}
+  - {name: oss207, ip: 192.168.0.223}
 
   - name: login0
     mac: E4:43:4B:0B:F0:20
-    ip: "{{ networks.internal.subnet | ipaddr('240') | ipaddr('address') }}"
+    ip: 192.168.0.240
     node_type: login-ib
-# ## login1 hardware repurposed as pvetest01
-#  - name: login1
-#    mac: E4:43:4B:0B:EA:C8
-#    ip: "{{ networks.internal.subnet | ipaddr('241') | ipaddr('address') }}"
-#    node_type: login-sl7
+  - name: login1
+    mac: E4:43:4B:0B:EA:C8
+    ip: 192.168.0.241
+    node_type: login-sl7
   - name: login2
     mac: 78:AC:44:6C:07:B6
-    ip: "{{ networks.internal.subnet | ipaddr('242') | ipaddr('address') }}"
+    ip: 192.168.0.242
     node_type: login-ib
 
-  - name: login200
-    mac: 00:0A:F7:9B:24:C8
-    ip: "{{ networks.internal.subnet | ipaddr('94') | ipaddr('address') }}"
-    node_type: login
-  - name: login201
-    mac: 00:0A:F7:A4:CC:08
-    ip: "{{ networks.internal.subnet | ipaddr('95') | ipaddr('address') }}"
-    node_type: login
-  - name: login202
-    mac: C4:CB:E1:EB:D7:38
-    ip: "{{ networks.internal.subnet | ipaddr('96') | ipaddr('address') }}"
-    node_type: login
-
-  - name: router200
-    mac: CC:96:E5:F5:31:BA
-    ip: "{{ networks.internal.subnet | ipaddr('122') | ipaddr('address') }}"
-    node_type: router
-  - name: router201
-    mac: CC:96:E5:F5:30:BA
-    ip: "{{ networks.internal.subnet | ipaddr('123') | ipaddr('address') }}"
-    node_type: router
-
   - name: fat100
     mac: E4:43:4B:1A:73:40
-    ip: "{{ networks.internal.subnet | ipaddr('124') | ipaddr('address') }}"
-    node_type: enlil
+    ip: 192.168.0.124
+    node_type: enlil-ib
   - name: fat101
     mac: E4:43:4B:99:61:88
-    ip: "{{ networks.internal.subnet | ipaddr('125') | ipaddr('address') }}"
-    node_type: enlil
+    ip: 192.168.0.125
+    node_type: enlil-ib
 
-  - name: fat200
-    mac: ec:2a:72:35:82:fe
-    ip: "{{ networks.internal.subnet | ipaddr('396') | ipaddr('address') }}"
-    node_type: urash
-  - name: fat201
-    mac: ec:2a:72:40:64:7c
-    ip: "{{ networks.internal.subnet | ipaddr('397') | ipaddr('address') }}"
-    node_type: urash
+#  - name: fat200
+#    mac: ec:2a:72:35:82:fe
+#    ip: 192.168.17.140
+#    node_type: urash
+#  - name: fat201
+#    mac: ec:2a:72:40:64:7c
+#    ip: 192.168.17.141
+#    node_type: urash
 
   - name: gpu100
     mac: E4:43:4B:25:52:A6
-    ip: "{{ networks.internal.subnet | ipaddr('160') | ipaddr('address') }}"
+    ip: 192.168.0.160
     node_type: nisaba
 
-  - name: gpua200
-    mac: ec:2a:72:4c:8f:36
-    ip: "{{ networks.internal.subnet | ipaddr('384') | ipaddr('address') }}"
-    node_type: haya
-  - name: gpua201
-    mac: ec:2a:72:4c:b9:26
-    ip: "{{ networks.internal.subnet | ipaddr('385') | ipaddr('address') }}"
-    node_type: haya
-  - name: gpun200
-    mac: ec:2a:72:4c:93:5a
-    ip: "{{ networks.internal.subnet | ipaddr('388') | ipaddr('address') }}"
-    node_type: nanna
-  - name: gpun201
-    mac: ec:2a:72:4c:8f:2e
-    ip: "{{ networks.internal.subnet | ipaddr('389') | ipaddr('address') }}"
-    node_type: nanna
-  - name: gpun202
-    mac: ec:2a:72:4c:93:4c
-    ip: "{{ networks.internal.subnet | ipaddr('390') | ipaddr('address') }}"
-    node_type: nanna
-  - name: gpun203
-    mac: ec:2a:72:4c:8f:0a
-    ip: "{{ networks.internal.subnet | ipaddr('391') | ipaddr('address') }}"
-    node_type: nanna
-  - name: gpuxn200
-    mac: c4:cb:e1:b9:b0:c6
-    ip: "{{ networks.internal.subnet | ipaddr('392') | ipaddr('address') }}"
-    node_type: nabu
+#  - name: gpua200
+#    mac: ec:2a:72:4c:b9:26
+#    ip: 192.168.17.128
+#    node_type: haya
+#  - name: gpua201
+#    mac: ec:2a:72:4c:93:5a
+#    ip: 192.168.17.129
+#    node_type: haya
+
+#  - name: gpun200
+#    mac: ec:2a:72:4c:8f:36
+#    ip: 192.168.17.132
+#    node_type: nanna
+#  - name: gpun201
+#    mac: ec:2a:72:4c:8f:2e
+#    ip: 192.168.17.133
+#    node_type: nanna
+#  - name: gpun202
+#    mac: ec:2a:72:4c:93:4c
+#    ip: 192.168.17.134
+#    node_type: nanna
+#  - name: gpun203
+#    mac: ec:2a:72:4c:8f:0a
+#    ip: 192.168.17.135
+#    node_type: nanna
 
   - name: node100
     mac: E4:43:4B:1A:78:44
-    ip: "{{ networks.internal.subnet | ipaddr('64') | ipaddr('address') }}"
+    ip: 192.168.0.64
     node_type: ki-sl7
   - name: node101
     mac: E4:43:4B:1A:70:8C
-    ip: "{{ networks.internal.subnet | ipaddr('65') | ipaddr('address') }}"
+    ip: 192.168.0.65
     node_type: ki-sl7
   - name: node102
     mac: E4:43:4B:1A:79:9C
-    ip: "{{ networks.internal.subnet | ipaddr('66') | ipaddr('address') }}"
+    ip: 192.168.0.66
     node_type: ki-sl7
   - name: node103
     mac: E4:43:4B:1A:75:F0
-    ip: "{{ networks.internal.subnet | ipaddr('67') | ipaddr('address') }}"
+    ip: 192.168.0.67
     node_type: ki-sl7
   - name: node104
     mac: E4:43:4B:1A:74:34
-    ip: "{{ networks.internal.subnet | ipaddr('68') | ipaddr('address') }}"
-    node_type: ki
+    ip: 192.168.0.68
+    node_type: ki-sl7
   - name: node105
     mac: E4:43:4B:1A:74:4C
-    ip: "{{ networks.internal.subnet | ipaddr('69') | ipaddr('address') }}"
-    node_type: ki
+    ip: 192.168.0.69
+    node_type: ki-sl7
   - name: node106
     mac: E4:43:4B:1A:7A:D4
-    ip: "{{ networks.internal.subnet | ipaddr('70') | ipaddr('address') }}"
-    node_type: ki
+    ip: 192.168.0.70
+    node_type: ki-ib
   - name: node107
     mac: E4:43:4B:1A:74:44
-    ip: "{{ networks.internal.subnet | ipaddr('71') | ipaddr('address') }}"
-    node_type: ki
+    ip: 192.168.0.71
+    node_type: ki-ib
   - name: node108
     mac: E4:43:4B:1A:74:30
-    ip: "{{ networks.internal.subnet | ipaddr('72') | ipaddr('address') }}"
-    node_type: ki
+    ip: 192.168.0.72
+    node_type: ki-ib
   - name: node109
     mac: E4:43:4B:1A:74:50
-    ip: "{{ networks.internal.subnet | ipaddr('73') | ipaddr('address') }}"
+    ip: 192.168.0.73
     node_type: ki-ib
   - name: node110
     mac: E4:43:4B:1A:7A:B4
-    ip: "{{ networks.internal.subnet | ipaddr('74') | ipaddr('address') }}"
+    ip: 192.168.0.74
     node_type: ki-ib
   - name: node111
     mac: E4:43:4B:1A:73:F4
-    ip: "{{ networks.internal.subnet | ipaddr('75') | ipaddr('address') }}"
+    ip: 192.168.0.75
     node_type: ki-ib
   - name: node112
     mac: E4:43:4B:1A:6C:8C
-    ip: "{{ networks.internal.subnet | ipaddr('76') | ipaddr('address') }}"
+    ip: 192.168.0.76
     node_type: ki-ib
   - name: node113
     mac: E4:43:4B:1A:77:34
-    ip: "{{ networks.internal.subnet | ipaddr('77') | ipaddr('address') }}"
+    ip: 192.168.0.77
     node_type: ki-ib
   - name: node114
     mac: E4:43:4B:1A:6C:58
-    ip: "{{ networks.internal.subnet | ipaddr('78') | ipaddr('address') }}"
+    ip: 192.168.0.78
     node_type: ki-ib
   - name: node115
     mac: E4:43:4B:20:98:F0
-    ip: "{{ networks.internal.subnet | ipaddr('79') | ipaddr('address') }}"
+    ip: 192.168.0.79
     node_type: ki-ib
   - name: node116
     mac: E4:43:4B:20:99:C0
-    ip: "{{ networks.internal.subnet | ipaddr('80') | ipaddr('address') }}"
+    ip: 192.168.0.80
     node_type: ki-ib
   - name: node117
     mac: E4:43:4B:20:CF:D8
-    ip: "{{ networks.internal.subnet | ipaddr('81') | ipaddr('address') }}"
+    ip: 192.168.0.81
     node_type: ki-ib
   - name: node118
     mac: E4:43:4B:5B:5A:A4
-    ip: "{{ networks.internal.subnet | ipaddr('82') | ipaddr('address') }}"
+    ip: 192.168.0.82
     node_type: ki-ib
   - name: node119
     mac: E4:43:4B:5B:5C:5C
-    ip: "{{ networks.internal.subnet | ipaddr('83') | ipaddr('address') }}"
+    ip: 192.168.0.83
     node_type: ki-ib
   - name: node120
     mac: E4:43:4B:5B:5D:50
-    ip: "{{ networks.internal.subnet | ipaddr('84') | ipaddr('address') }}"
+    ip: 192.168.0.84
     node_type: ki-ib
   - name: node121
     mac: E4:43:4B:5B:5C:E4
-    ip: "{{ networks.internal.subnet | ipaddr('85') | ipaddr('address') }}"
+    ip: 192.168.0.85
     node_type: ki-ib
   - name: node122
-    mac: E4:43:4B:20:98:F4
-#    mac: E4:43:4B:5B:5A:7C
-    ip: "{{ networks.internal.subnet | ipaddr('86') | ipaddr('address') }}"
+    mac: E4:43:4B:5B:5A:7C
+    ip: 192.168.0.86
     node_type: ki-ib
   - name: node123
     mac: E4:43:4B:5B:5D:84
-    ip: "{{ networks.internal.subnet | ipaddr('87') | ipaddr('address') }}"
+    ip: 192.168.0.87
     node_type: ki-ib
   - name: node124
     mac: E4:43:4B:5B:5A:B4
-    ip: "{{ networks.internal.subnet | ipaddr('88') | ipaddr('address') }}"
+    ip: 192.168.0.88
     node_type: ki-ib
   - name: node125
     mac: E4:43:4B:5B:5D:80
-    ip: "{{ networks.internal.subnet | ipaddr('89') | ipaddr('address') }}"
+    ip: 192.168.0.89
     node_type: ki-ib
   - name: node126
     mac: E4:43:4B:4B:8F:80
-    ip: "{{ networks.internal.subnet | ipaddr('90') | ipaddr('address') }}"
+    ip: 192.168.0.90
     node_type: ki-ib
   - name: node127
     mac: E4:43:4B:4B:C8:CC
-    ip: "{{ networks.internal.subnet | ipaddr('91') | ipaddr('address') }}"
+    ip: 192.168.0.91
     node_type: ki-ib
   - name: node128
     mac: E4:43:4B:5C:5A:30
-    ip: "{{ networks.internal.subnet | ipaddr('92') | ipaddr('address') }}"
+    ip: 192.168.0.92
     node_type: ki-ib
 
   - name: node200
     mac: EC:2A:72:40:99:3E
-    ip: "{{ networks.internal.subnet | ipaddr('256') | ipaddr('address') }}"
+    ip: 192.168.0.93
     node_type: an-ib
-  - name: node201
-    mac: EC:2A:72:4C:A0:CE
-    ip: "{{ networks.internal.subnet | ipaddr('257') | ipaddr('address') }}"
-    node_type: anu
-  - name: node202
-    mac: EC:2A:72:4C:7D:2C
-    ip: "{{ networks.internal.subnet | ipaddr('258') | ipaddr('address') }}"
-    node_type: anu
-  - name: node203
-    mac: EC:2A:72:4C:D1:CC
-    ip: "{{ networks.internal.subnet | ipaddr('259') | ipaddr('address') }}"
-    node_type: anu
-  - name: node204
-    mac: EC:2A:72:4C:7B:24
-    ip: "{{ networks.internal.subnet | ipaddr('260') | ipaddr('address') }}"
-    node_type: anu
-  - name: node205
-    mac: EC:2A:72:4C:AD:48
-    ip: "{{ networks.internal.subnet | ipaddr('261') | ipaddr('address') }}"
-    node_type: anu
-  - name: node206
-    mac: EC:2A:72:4C:A9:52
-    ip: "{{ networks.internal.subnet | ipaddr('262') | ipaddr('address') }}"
-    node_type: anu
-  - name: node207
-    mac: EC:2A:72:4C:77:9C
-    ip: "{{ networks.internal.subnet | ipaddr('263') | ipaddr('address') }}"
-    node_type: anu
-  - name: node208
-    mac: EC:2A:72:4C:85:1E
-    ip: "{{ networks.internal.subnet | ipaddr('264') | ipaddr('address') }}"
-    node_type: anu
-  - name: node209
-    mac: EC:2A:72:4C:7D:4E
-    ip: "{{ networks.internal.subnet | ipaddr('265') | ipaddr('address') }}"
-    node_type: anu
-  - name: node210
-    mac: EC:2A:72:4C:7F:C2
-    ip: "{{ networks.internal.subnet | ipaddr('266') | ipaddr('address') }}"
-    node_type: anu
-  - name: node211
-    mac: EC:2A:72:4C:7F:AE
-    ip: "{{ networks.internal.subnet | ipaddr('267') | ipaddr('address') }}"
-    node_type: anu
-  - name: node212
-    mac: EC:2A:72:4C:79:BC
-    ip: "{{ networks.internal.subnet | ipaddr('268') | ipaddr('address') }}"
-    node_type: anu
-  - name: node213
-    mac: EC:2A:72:4C:7E:28
-    ip: "{{ networks.internal.subnet | ipaddr('269') | ipaddr('address') }}"
-    node_type: anu
-  - name: node214
-    mac: EC:2A:72:4C:7B:9E
-    ip: "{{ networks.internal.subnet | ipaddr('270') | ipaddr('address') }}"
-    node_type: anu
-  - name: node215
-    mac: EC:2A:72:4C:7B:32
-    ip: "{{ networks.internal.subnet | ipaddr('271') | ipaddr('address') }}"
-    node_type: anu
-  - name: node216
-    mac: EC:2A:72:4C:7F:42
-    ip: "{{ networks.internal.subnet | ipaddr('272') | ipaddr('address') }}"
-    node_type: anu
-  - name: node217
-    mac: EC:2A:72:4C:77:64
-    ip: "{{ networks.internal.subnet | ipaddr('273') | ipaddr('address') }}"
-    node_type: anu
-  - name: node218
-    mac: EC:2A:72:4C:88:66
-    ip: "{{ networks.internal.subnet | ipaddr('274') | ipaddr('address') }}"
-    node_type: anu
-  - name: node219
-    mac: EC:2A:72:4C:7B:B2
-    ip: "{{ networks.internal.subnet | ipaddr('275') | ipaddr('address') }}"
-    node_type: anu
-  - name: node220
-    mac: EC:2A:72:4C:7D:6E
-    ip: "{{ networks.internal.subnet | ipaddr('276') | ipaddr('address') }}"
-    node_type: anu
-  - name: node221
-    mac: EC:2A:72:4C:AA:66
-    ip: "{{ networks.internal.subnet | ipaddr('277') | ipaddr('address') }}"
-    node_type: anu
-  - name: node222
-    mac: EC:2A:72:4C:7F:B0
-    ip: "{{ networks.internal.subnet | ipaddr('278') | ipaddr('address') }}"
-    node_type: anu
-  - name: node223
-    mac: EC:2A:72:4C:8D:58
-    ip: "{{ networks.internal.subnet | ipaddr('279') | ipaddr('address') }}"
-    node_type: anu
-  - name: node224
-    mac: EC:2A:72:4C:7F:74
-    ip: "{{ networks.internal.subnet | ipaddr('280') | ipaddr('address') }}"
-    node_type: anu
-  - name: node225
-    mac: EC:2A:72:4C:A1:3E
-    ip: "{{ networks.internal.subnet | ipaddr('281') | ipaddr('address') }}"
-    node_type: anu
-  - name: node226
-    mac: EC:2A:72:4C:A3:34
-    ip: "{{ networks.internal.subnet | ipaddr('282') | ipaddr('address') }}"
-    node_type: anu
-  - name: node227
-    mac: EC:2A:72:4C:D4:14
-    ip: "{{ networks.internal.subnet | ipaddr('283') | ipaddr('address') }}"
-    node_type: anu
-  - name: node228
-    mac: EC:2A:72:4C:88:68
-    ip: "{{ networks.internal.subnet | ipaddr('284') | ipaddr('address') }}"
-    node_type: anu
-  - name: node229
-    mac: EC:2A:72:40:50:22
-    ip: "{{ networks.internal.subnet | ipaddr('285') | ipaddr('address') }}"
-    node_type: anu
-  - name: node230
-    mac: EC:2A:72:4C:5D:E0
-    ip: "{{ networks.internal.subnet | ipaddr('286') | ipaddr('address') }}"
-    node_type: anu
-  - name: node231
-    mac: EC:2A:72:4C:AD:C4
-    ip: "{{ networks.internal.subnet | ipaddr('287') | ipaddr('address') }}"
-    node_type: anu
-  - name: node232
-    mac: EC:2A:72:4C:A3:26
-    ip: "{{ networks.internal.subnet | ipaddr('288') | ipaddr('address') }}"
-    node_type: anu
-  - name: node233
-    mac: EC:2A:72:4C:84:DE
-    ip: "{{ networks.internal.subnet | ipaddr('289') | ipaddr('address') }}"
-    node_type: anu
-  - name: node234
-    mac: EC:2A:72:40:48:42
-    ip: "{{ networks.internal.subnet | ipaddr('290') | ipaddr('address') }}"
-    node_type: anu
-  - name: node235
-    mac: EC:2A:72:4C:7F:8C
-    ip: "{{ networks.internal.subnet | ipaddr('291') | ipaddr('address') }}"
-    node_type: anu
-  - name: node236
-    mac: EC:2A:72:4C:A9:64
-    ip: "{{ networks.internal.subnet | ipaddr('292') | ipaddr('address') }}"
-    node_type: anu
-  - name: node237
-    mac: EC:2A:72:4C:AD:56
-    ip: "{{ networks.internal.subnet | ipaddr('293') | ipaddr('address') }}"
-    node_type: anu
-  - name: node238
-    mac: EC:2A:72:4C:88:18
-    ip: "{{ networks.internal.subnet | ipaddr('294') | ipaddr('address') }}"
-    node_type: anu
-  - name: node239
-    mac: EC:2A:72:35:94:E6
-    ip: "{{ networks.internal.subnet | ipaddr('295') | ipaddr('address') }}"
-    node_type: anu
-  - name: node240
-    mac: EC:2A:72:4C:7B:42
-    ip: "{{ networks.internal.subnet | ipaddr('296') | ipaddr('address') }}"
-    node_type: anu
-  - name: node241
-    mac: EC:2A:72:4C:7A:96
-    ip: "{{ networks.internal.subnet | ipaddr('297') | ipaddr('address') }}"
-    node_type: anu
-  - name: node242
-    mac: EC:2A:72:4C:AD:52
-    ip: "{{ networks.internal.subnet | ipaddr('298') | ipaddr('address') }}"
-    node_type: anu
-  - name: node243
-    mac: EC:2A:72:4C:8D:84
-    ip: "{{ networks.internal.subnet | ipaddr('299') | ipaddr('address') }}"
-    node_type: anu
-  - name: node244
-    mac: EC:2A:72:40:45:6A
-    ip: "{{ networks.internal.subnet | ipaddr('300') | ipaddr('address') }}"
-    node_type: anu
-  - name: node245
-    mac: EC:2A:72:4C:7D:62
-    ip: "{{ networks.internal.subnet | ipaddr('301') | ipaddr('address') }}"
-    node_type: anu
-  - name: node246
-    mac: EC:2A:72:4C:D4:D6
-    ip: "{{ networks.internal.subnet | ipaddr('302') | ipaddr('address') }}"
-    node_type: anu
-  - name: node247
-    mac: EC:2A:72:4C:A9:EE
-    ip: "{{ networks.internal.subnet | ipaddr('303') | ipaddr('address') }}"
-    node_type: anu
-  - name: node248
-    mac: EC:2A:72:4C:86:90
-    ip: "{{ networks.internal.subnet | ipaddr('304') | ipaddr('address') }}"
-    node_type: anu
-  - name: node249
-    mac: EC:2A:72:40:61:84
-    ip: "{{ networks.internal.subnet | ipaddr('305') | ipaddr('address') }}"
-    node_type: anu
-  - name: node250
-    mac: EC:2A:72:4C:7E:EA
-    ip: "{{ networks.internal.subnet | ipaddr('306') | ipaddr('address') }}"
-    node_type: anu
-  - name: node251
-    mac: EC:2A:72:4C:79:D2
-    ip: "{{ networks.internal.subnet | ipaddr('307') | ipaddr('address') }}"
-    node_type: anu
-  - name: node252
-    mac: EC:2A:72:4C:A3:5C
-    ip: "{{ networks.internal.subnet | ipaddr('308') | ipaddr('address') }}"
-    node_type: anu
-  - name: node253
-    mac: EC:2A:72:4C:86:06
-    ip: "{{ networks.internal.subnet | ipaddr('309') | ipaddr('address') }}"
-    node_type: anu
-  - name: node254
-    mac: EC:2A:72:40:5B:90
-    ip: "{{ networks.internal.subnet | ipaddr('310') | ipaddr('address') }}"
-    node_type: anu
-  - name: node255
-    mac: EC:2A:72:4C:7D:64
-    ip: "{{ networks.internal.subnet | ipaddr('311') | ipaddr('address') }}"
-    node_type: anu
-  - name: node256
-    mac: EC:2A:72:4C:79:AA
-    ip: "{{ networks.internal.subnet | ipaddr('312') | ipaddr('address') }}"
-    node_type: anu
-  - name: node257
-    mac: EC:2A:72:4C:AD:44
-    ip: "{{ networks.internal.subnet | ipaddr('313') | ipaddr('address') }}"
-    node_type: anu
-  - name: node258
-    mac: EC:2A:72:4C:AD:46
-    ip: "{{ networks.internal.subnet | ipaddr('314') | ipaddr('address') }}"
-    node_type: anu
-  - name: node259
-    mac: EC:2A:72:40:61:CA
-    ip: "{{ networks.internal.subnet | ipaddr('315') | ipaddr('address') }}"
-    node_type: anu
-  - name: node260
-    mac: EC:2A:72:4C:A9:9C
-    ip: "{{ networks.internal.subnet | ipaddr('316') | ipaddr('address') }}"
-    node_type: anu
-  - name: node261
-    mac: EC:2A:72:4C:7D:3C
-    ip: "{{ networks.internal.subnet | ipaddr('317') | ipaddr('address') }}"
-    node_type: anu
-  - name: node262
-    mac: EC:2A:72:4C:5C:AA
-    ip: "{{ networks.internal.subnet | ipaddr('318') | ipaddr('address') }}"
-    node_type: anu
-  - name: node263
-    mac: EC:2A:72:4C:79:9C
-    ip: "{{ networks.internal.subnet | ipaddr('319') | ipaddr('address') }}"
-    node_type: anu
-  - name: node264
-    mac: EC:2A:72:50:74:F8
-    ip: "{{ networks.internal.subnet | ipaddr('320') | ipaddr('address') }}"
-    node_type: anu
-  - name: node265
-    mac: EC:2A:72:4C:D4:A0
-    ip: "{{ networks.internal.subnet | ipaddr('321') | ipaddr('address') }}"
-    node_type: anu
-  - name: node266
-    mac: EC:2A:72:4C:7D:DA
-    ip: "{{ networks.internal.subnet | ipaddr('322') | ipaddr('address') }}"
-    node_type: anu
-  - name: node267
-    mac: EC:2A:72:4C:A9:5C
-    ip: "{{ networks.internal.subnet | ipaddr('323') | ipaddr('address') }}"
-    node_type: anu
-  - name: node268
-    mac: EC:2A:72:4C:AD:FE
-    ip: "{{ networks.internal.subnet | ipaddr('324') | ipaddr('address') }}"
-    node_type: anu
-  - name: node269
-    mac: EC:2A:72:4C:A9:5A
-    ip: "{{ networks.internal.subnet | ipaddr('325') | ipaddr('address') }}"
-    node_type: anu
-  - name: node270
-    mac: EC:2A:72:4C:D4:BC
-    ip: "{{ networks.internal.subnet | ipaddr('326') | ipaddr('address') }}"
-    node_type: anu
-  - name: node271
-    mac: EC:2A:72:4C:A1:34
-    ip: "{{ networks.internal.subnet | ipaddr('327') | ipaddr('address') }}"
-    node_type: anu
-  - name: node272
-    mac: EC:2A:72:4C:A9:D6
-    ip: "{{ networks.internal.subnet | ipaddr('328') | ipaddr('address') }}"
-    node_type: anu
-  - name: node273
-    mac: EC:2A:72:4C:D3:EC
-    ip: "{{ networks.internal.subnet | ipaddr('329') | ipaddr('address') }}"
-    node_type: anu
-  - name: node274
-    mac: EC:2A:72:4C:A9:A0
-    ip: "{{ networks.internal.subnet | ipaddr('330') | ipaddr('address') }}"
-    node_type: anu
-  - name: node275
-    mac: EC:2A:72:4C:18:94
-    ip: "{{ networks.internal.subnet | ipaddr('331') | ipaddr('address') }}"
-    node_type: anu
-  - name: node276
-    mac: EC:2A:72:4C:AC:FA
-    ip: "{{ networks.internal.subnet | ipaddr('332') | ipaddr('address') }}"
-    node_type: anu
-  - name: node277
-    mac: EC:2A:72:4C:79:AE
-    ip: "{{ networks.internal.subnet | ipaddr('333') | ipaddr('address') }}"
-    node_type: anu
+#  - name: node201
+#    mac: EC:2A:72:4C:A0:CE
+#    ip: 192.168.1.1
+#    node_type: anu
+#  - name: node202
+#    mac: EC:2A:72:4C:7D:2C
+#    ip: 192.168.1.2
+#    node_type: anu
+#  - name: node203
+#    mac: EC:2A:72:4C:D1:CC
+#    ip: 192.168.1.3
+#    node_type: anu
+#  - name: node204
+#    mac: EC:2A:72:4C:7B:24
+#    ip: 192.168.1.4
+#    node_type: anu
+#  - name: node205
+#    mac: EC:2A:72:4C:AD:48
+#    ip: 192.168.1.5
+#    node_type: anu
+#  - name: node206
+#    mac: EC:2A:72:4C:A9:52
+#    ip: 192.168.1.6
+#    node_type: anu
+#  - name: node207
+#    mac: EC:2A:72:4C:77:9C
+#    ip: 192.168.1.7
+#    node_type: anu
+#  - name: node208
+#    mac: EC:2A:72:4C:85:1E
+#    ip: 192.168.1.8
+#    node_type: anu
+#  - name: node209
+#    mac: EC:2A:72:4C:7D:4E
+#    ip: 192.168.1.9
+#    node_type: anu
+#  - name: node210
+#    mac: EC:2A:72:4C:7F:C2
+#    ip: 192.168.1.10
+#    node_type: anu
+#  - name: node211
+#    mac: EC:2A:72:4C:7F:AE
+#    ip: 192.168.1.11
+#    node_type: anu
+#  - name: node212
+#    mac: EC:2A:72:4C:79:BC
+#    ip: 192.168.1.12
+#    node_type: anu
+#  - name: node213
+#    mac: EC:2A:72:4C:7E:28
+#    ip: 192.168.1.13
+#    node_type: anu
+#  - name: node214
+#    mac: EC:2A:72:4C:7B:9E
+#    ip: 192.168.1.14
+#    node_type: anu
+#  - name: node215
+#    mac: EC:2A:72:4C:7B:32
+#    ip: 192.168.1.15
+#    node_type: anu
+#  - name: node216
+#    mac: EC:2A:72:4C:7F:42
+#    ip: 192.168.1.16
+#    node_type: anu
+#  - name: node217
+#    mac: EC:2A:72:4C:77:64
+#    ip: 192.168.1.17
+#    node_type: anu
+#  - name: node218
+#    mac: EC:2A:72:4C:88:66
+#    ip: 192.168.1.18
+#    node_type: anu
+#  - name: node219
+#    mac: EC:2A:72:4C:7B:B2
+#    ip: 192.168.1.19
+#    node_type: anu
+#  - name: node220
+#    mac: EC:2A:72:4C:7D:6E
+#    ip: 192.168.1.20
+#    node_type: anu
+#  - name: node221
+#    mac: EC:2A:72:4C:AA:66
+#    ip: 192.168.1.21
+#    node_type: anu
+#  - name: node222
+#    mac: EC:2A:72:4C:7F:B0
+#    ip: 192.168.1.22
+#    node_type: anu
+#  - name: node223
+#    mac: EC:2A:72:4C:8D:58
+#    ip: 192.168.1.23
+#    node_type: anu
+#  - name: node224
+#    mac: EC:2A:72:4C:7F:74
+#    ip: 192.168.1.24
+#    node_type: anu
+#  - name: node225
+#    mac: EC:2A:72:4C:A1:3E
+#    ip: 192.168.1.25
+#    node_type: anu
+#  - name: node226
+#    mac: EC:2A:72:4C:A3:34
+#    ip: 192.168.1.26
+#    node_type: anu
+#  - name: node227
+#    mac: EC:2A:72:4C:D4:14
+#    ip: 192.168.1.27
+#    node_type: anu
+#  - name: node228
+#    mac: EC:2A:72:4C:88:68
+#    ip: 192.168.1.28
+#    node_type: anu
+#  - name: node229
+#    mac: EC:2A:72:40:50:22
+#    ip: 192.168.1.29
+#    node_type: anu
+#  - name: node230
+#    mac: EC:2A:72:4C:5D:E0
+#    ip: 192.168.1.30
+#    node_type: anu
+#  - name: node231
+#    mac: EC:2A:72:4C:AD:C4
+#    ip: 192.168.1.31
+#    node_type: anu
+#  - name: node232
+#    mac: EC:2A:72:4C:A3:26
+#    ip: 192.168.1.32
+#    node_type: anu
+#  - name: node233
+#    mac: EC:2A:72:4C:84:DE
+#    ip: 192.168.1.33
+#    node_type: anu
+#  - name: node234
+#    mac: EC:2A:72:40:48:42
+#    ip: 192.168.1.34
+#    node_type: anu
+#  - name: node235
+#    mac: EC:2A:72:4C:7F:8C
+#    ip: 192.168.1.35
+#    node_type: anu
+#  - name: node236
+#    mac: EC:2A:72:4C:A9:64
+#    ip: 192.168.1.36
+#    node_type: anu
+#  - name: node237
+#    mac: EC:2A:72:4C:AD:56
+#    ip: 192.168.1.37
+#    node_type: anu
+#  - name: node238
+#    mac: EC:2A:72:4C:88:18
+#    ip: 192.168.1.38
+#    node_type: anu
+#  - name: node239
+#    mac: EC:2A:72:35:94:E6
+#    ip: 192.168.1.39
+#    node_type: anu
+#  - name: node240
+#    mac: EC:2A:72:4C:7B:42
+#    ip: 192.168.1.40
+#    node_type: anu
+#  - name: node241
+#    mac: EC:2A:72:4C:7A:96
+#    ip: 192.168.1.41
+#    node_type: anu
+#  - name: node242
+#    mac: EC:2A:72:4C:AD:52
+#    ip: 192.168.1.42
+#    node_type: anu
+#  - name: node243
+#    mac: EC:2A:72:4C:8D:84
+#    ip: 192.168.1.43
+#    node_type: anu
+#  - name: node244
+#    mac: EC:2A:72:40:45:6A
+#    ip: 192.168.1.44
+#    node_type: anu
+#  - name: node245
+#    mac: EC:2A:72:4C:7D:62
+#    ip: 192.168.1.45
+#    node_type: anu
+#  - name: node246
+#    mac: EC:2A:72:4C:D4:D6
+#    ip: 192.168.1.46
+#    node_type: anu
+#  - name: node247
+#    mac: EC:2A:72:4C:A9:EE
+#    ip: 192.168.1.47
+#    node_type: anu
+#  - name: node248
+#    mac: EC:2A:72:4C:86:90
+#    ip: 192.168.1.48
+#    node_type: anu
+#  - name: node249
+#    mac: EC:2A:72:40:61:84
+#    ip: 192.168.1.49
+#    node_type: anu
+#  - name: node250
+#    mac: EC:2A:72:4C:7E:EA
+#    ip: 192.168.1.50
+#    node_type: anu
+#  - name: node251
+#    mac: EC:2A:72:4C:79:D2
+#    ip: 192.168.1.51
+#    node_type: anu
+#  - name: node252
+#    mac: EC:2A:72:4C:A3:5C
+#    ip: 192.168.1.52
+#    node_type: anu
+#  - name: node253
+#    mac: EC:2A:72:4C:86:06
+#    ip: 192.168.1.53
+#    node_type: anu
+#  - name: node254
+#    mac: EC:2A:72:40:5B:90
+#    ip: 192.168.1.54
+#    node_type: anu
+#  - name: node255
+#    mac: EC:2A:72:4C:7D:64
+#    ip: 192.168.1.55
+#    node_type: anu
+#  - name: node256
+#    mac: EC:2A:72:4C:79:AA
+#    ip: 192.168.1.56
+#    node_type: anu
+#  - name: node257
+#    mac: EC:2A:72:4C:AD:44
+#    ip: 192.168.1.57
+#    node_type: anu
+#  - name: node258
+#    mac: EC:2A:72:4C:AD:46
+#    ip: 192.168.1.58
+#    node_type: anu
+#  - name: node259
+#    mac: EC:2A:72:40:61:CA
+#    ip: 192.168.1.59
+#    node_type: anu
+#  - name: node260
+#    mac: EC:2A:72:4C:A9:9C
+#    ip: 192.168.1.60
+#    node_type: anu
+#  - name: node261
+#    mac: EC:2A:72:4C:7D:3C
+#    ip: 192.168.1.61
+#    node_type: anu
+#  - name: node262
+#    mac: EC:2A:72:4C:5C:AA
+#    ip: 192.168.1.62
+#    node_type: anu
+#  - name: node263
+#    mac: EC:2A:72:4C:79:9C
+#    ip: 192.168.1.63
+#    node_type: anu
+#  - name: node264
+#    mac: EC:2A:72:50:74:F8
+#    ip: 192.168.1.64
+#    node_type: anu
+#  - name: node265
+#    mac: EC:2A:72:4C:D4:A0
+#    ip: 192.168.1.65
+#    node_type: anu
+#  - name: node266
+#    mac: EC:2A:72:4C:7D:DA
+#    ip: 192.168.1.66
+#    node_type: anu
+#  - name: node267
+#    mac: EC:2A:72:4C:A9:5C
+#    ip: 192.168.1.67
+#    node_type: anu
+#  - name: node268
+#    mac: EC:2A:72:4C:AD:FE
+#    ip: 192.168.1.68
+#    node_type: anu
+#  - name: node269
+#    mac: EC:2A:72:4C:A9:5A
+#    ip: 192.168.1.69
+#    node_type: anu
+#  - name: node270
+#    mac: EC:2A:72:4C:D4:BC
+#    ip: 192.168.1.70
+#    node_type: anu
+#  - name: node271
+#    mac: EC:2A:72:4C:A1:34
+#    ip: 192.168.1.71
+#    node_type: anu
+#  - name: node272
+#    mac: EC:2A:72:4C:A9:D6
+#    ip: 192.168.1.72
+#    node_type: anu
+#  - name: node273
+#    mac: EC:2A:72:4C:D3:EC
+#    ip: 192.168.1.73
+#    node_type: anu
+#  - name: node274
+#    mac: EC:2A:72:4C:A9:A0
+#    ip: 192.168.1.74
+#    node_type: anu
+#  - name: node275
+#    mac: 00:00:00:00:00:00
+#    ip: 192.168.1.75
+#    node_type: anu
+#  - name: node276
+#    mac: EC:2A:72:4C:AC:FA
+#    ip: 192.168.1.76
+#    node_type: anu
+#  - name: node277
+#    mac: EC:2A:72:4C:79:AE
+#    ip: 192.168.1.77
+#    node_type: anu
 
 node_types:
-    ki:
-      slurm_conf: CoresPerSocket=16 RealMemory=384000 Sockets=2 ThreadsPerCore=1 TmpDisk=330000 Weight=1 Feature=gen2,intel,32cpus,384g,ki,avx512,12gpercpu
-      slurm_partitions: [main]
-      image: gen3normal
-      networks:
-        internal: {interface: eno1}
-        omnipath: {interface: ibs1}
-    ki-ib:
-      slurm_conf: CoresPerSocket=16 RealMemory=384000 Sockets=2 ThreadsPerCore=1 TmpDisk=330000 Weight=1 Feature=gen2,intel,32cpus,384g,ki,avx512,12gpercpu
-      slurm_partitions: [main]
-      image: gen3old
-      networks:
-         internal: {interface: eno1}
-         infiniband: {interface: ibs1}
-    enlil:
-      slurm_conf: CoresPerSocket=16 RealMemory=1536000 Sockets=4 ThreadsPerCore=1 TmpDisk=150000 Weight=10 Feature=intel,24gpercpu,gen2,64cpus,1536g,enlil,avx512
-      slurm_partitions: [main]
-      image: gen3normal
-      networks:
-        internal: {interface: eno1}
-        omnipath: {interface: ibs4}
-    enlil-ib:
-      slurm_conf: CoresPerSocket=16 RealMemory=1536000 Sockets=4 ThreadsPerCore=1 TmpDisk=150000 Weight=10 Feature=intel,24gpercpu,gen2,64cpus,1536g,enlil,avx512
-      slurm_partitions: [main]
-      image: gen3old
-      networks:
-        internal: {interface: eno1}
-        infiniband: {interface: ibs3}
-    an:
-      slurm_conf: CoresPerSocket=64 RealMemory=515000 Sockets=2 ThreadsPerCore=1 TmpDisk=865000 Weight=2 Feature=gen3,an,amd,128cpus,500g,4gpercpu
-      slurm_partitions: [main]
-      image: gen3normal
-      networks:
-        internal: {interface: eno8303}
-        omnipath: {interface: ibs1}
-    an-ib:
-      slurm_conf: CoresPerSocket=64 RealMemory=515000 Sockets=2 ThreadsPerCore=1 TmpDisk=865000 Weight=2 Feature=gen3,amd,128cpus,500g,4gpercpu
-      slurm_partitions: [main]
-      image: gen3old
-      networks:
-        internal: {interface: eno8303}
-        infiniband: {interface: ibs1}
-    anu:
-      slurm_conf: CoresPerSocket=64 RealMemory=1015000 Sockets=2 ThreadsPerCore=1 TmpDisk=865000 Weight=2 Feature=gen3,anu,amd,128cpus,1000g,8gpercpu
-      slurm_partitions: [main]
-      image: gen3normal
-      networks:
-        internal: {interface: eno8303}
-        omnipath: {interface: ibs1}
-    urash:
-      slurm_conf: CoresPerSocket=48 RealMemory=4096000 Sockets=2 ThreadsPerCore=1 TmpDisk=10000000 Weight=2 Feature=gen3,urash,amd,96cpus,4000g,41gpercpu
-      slurm_partitions: [main]
-      image: gen3normal
-      networks:
-        internal: {interface: eno8303}
-        omnipath: {interface: ibs2}
-    nisaba:
-      slurm_conf: CoresPerSocket=16 RealMemory=384000 Sockets=2 ThreadsPerCore=1 TmpDisk=290000 Weight=100 Gres=gpu:4 Feature=intel,nvidia,V100,gen2,32cpus,384g,nisaba,avx512,12gpercpu
-      slurm_partitions: [gpu]
-      image: gen2gpu
-      networks:
-        internal: {interface: eno3}
-        infiniband: {interface: ibp94s0}
-    nanna:
-      slurm_conf: CoresPerSocket=32 RealMemory=1015000 Sockets=2 ThreadsPerCore=1 TmpDisk=865000 Weight=2 Feature=gen3,nanna,a100,nvidia_gpu
-      slurm_partitions: [gpu]
-      image: gen3gpu_nvidia
-      networks:
-        internal: {interface: eno8303}
-        omnipath: {interface: ibs6}
-    nabu:
-      slurm_conf: CoresPerSocket=32 RealMemory=512000 Sockets=2 ThreadsPerCore=1 TmpDisk=865000 Weight=200 Gres=gpu:2 Feature=gen3,nabu,A6000,nvidia_gpu
-      slurm_partitions: [gpu]
-      image: gen3gpu_nvidia
-      networks:
-        internal: {interface: eno8303}
-        omnipath: {interface: ibs3}
-    haya:
-      slurm_conf: CoresPerSocket=32 RealMemory=1015000 Sockets=2 ThreadsPerCore=1 TmpDisk=865000 Weight=2 Feature=gen3,haya,i210,amd_gpu
-      slurm_partitions: [gpu_amd]
-      image: gen3gpu_amd
-      networks:
-        internal: {interface: eno8303}
-        omnipath: {interface: ibs6}
-    ki-sl7:
-      slurm_conf: CoresPerSocket=16 RealMemory=384000 Sockets=2 ThreadsPerCore=1 TmpDisk=330000 Weight=1 Feature=gen2,intel,32cpus,384g,ki,avx512,12gpercpu
-      slurm_partitions: [sl7]
-      image: gen2normal
-      networks:
-        internal: {interface: eno1}
-        infiniband: {interface: ib0}
-    login-sl7:
-      image: gen2login
-      networks:
-        external: {interface: eno1}
-        internal: {interface: eno3}
-        infiniband: {interface: ib0}
-    login-ib:
-      image: gen3login-ib
-      networks:
-        external: {interface: eno1}
-        internal: {interface: eno3}
-        infiniband: {interface: ibs1}
-    login:
-      image: gen3login
-      networks:
-        external:
-          interface: bond0
-          bond:
-            name: bond0
-            interfaces: [ens3f0np0,ens3f1np1]
-            parameters: "mode: 802.3ad, lacp-rate: fast, mii-monitor-interval: 100"
-      #  internal: {interface: eno8303}
-        internal: {interface: eno1}
-        omnipath: {interface: ibs6}
-    router:
-      image: gen3router
-      networks:
-        internal: {interface: eno8303}
-        infiniband: {interface: ibs3}
-        omnipath: {interface: ibs2}
-        gige:
-          interface: vlan.3899
-          bond:
-            name: bond0
-            interfaces: [ens4f0np0,ens4f1np1]
-            parameters: "mode: 802.3ad, lacp-rate: fast, mii-monitor-interval: 100"
-          vlan:
-            id: 3899
-            interface: bond0
-        bif:
-          interface: vlan.3699
-          bond:
-            name: bond0
-            interfaces: [ens4f0np0,ens4f1np1]
-            parameters: "mode: 802.3ad, lacp-rate: fast, mii-monitor-interval: 100"
-          vlan:
-            id: 3699
-            interface: bond0
+  login-sl7:
+    internalnet_interface: eno3
+    ib_interface: ib0
+#    image: login-sl7
+#    networks:
+#      internal: {interface: eno3}
+#      infiniband: {interface: ib0}
+  login-ib:
+    internalnet_interface: eno3
+    ib_interface: ibs1
+#    image: gen3login
+#    networks:
+#      internal: {interface: eno3}
+#      infiniband: {interface: ibs1}
+  ki-ib:
+    slurm_conf: CoresPerSocket=16 RealMemory=384000 Sockets=2 ThreadsPerCore=1 TmpDisk=330000 Weight=1 Feature=gen2,intel,32cpus,384g,ki,avx512,12gpercpu
+    slurm_partitions: [main]
+    internalnet_interface: eno1
+    ib_interface: ibs1
+#    image: gen3normal
+#    networks:
+#      internal: {interface: eno1}
+#      infiniband: {interface: ibs1}
+  an-ib:
+    slurm_conf: CoresPerSocket=64 RealMemory=515000 Sockets=2 ThreadsPerCore=1 TmpDisk=865000 Weight=2 Feature=gen3,amd,128cpus,500g,4gpercpu
+    slurm_partitions: [main]
+    internalnet_interface: eno8303
+    ib_interface: ibs1
+#    image: gen3normal
+#    networks:
+#      internal: {interface: eno8303}
+#      infiniband: {interface: ibs1}
+  enlil-ib:
+    slurm_conf: CoresPerSocket=16 RealMemory=1536000 Sockets=4 ThreadsPerCore=1 TmpDisk=150000 Weight=10 Feature=intel,24gpercpu,gen2,64cpus,1536g,enlil,avx512
+    slurm_partitions: [main]
+    internalnet_interface: eno1
+    ib_interface: ibs3
+#    image: gen3normal
+#    networks:
+#      internal: {interface: eno1}
+#      infiniband: {interface: ibs3}
+  enlil-sl7:
+    slurm_conf: CoresPerSocket=16 RealMemory=1536000 Sockets=4 ThreadsPerCore=1 TmpDisk=150000 Weight=10 Feature=intel,24gpercpu,gen2,64cpus,1536g,enlil,avx512
+    slurm_partitions: [sl7]
+    internalnet_interface: eno1
+    ib_interface: ib0
+#    image: gen2normal
+#    networks:
+#      internal: {interface: eno1}
+#      infiniband: {interface: ib0}
+  nisaba:
+    slurm_conf: CoresPerSocket=16 RealMemory=384000 Sockets=2 ThreadsPerCore=1 TmpDisk=290000 Weight=100 Gres=gpu:4 Feature=intel,nvidia,V100,gen2,32cpus,384g,nisaba,avx512,12gpercpu
+    slurm_partitions: [gpu]
+    internalnet_interface: eno3
+    ib_interface: ib0
+#    image: gen2gpu
+#    networks:
+#      internal: {interface: eno3}
+#      infiniband: {interface: ib0}
+  ki-sl7:
+    slurm_conf: CoresPerSocket=16 RealMemory=384000 Sockets=2 ThreadsPerCore=1 TmpDisk=330000 Weight=1 Feature=gen2,intel,32cpus,384g,ki,avx512,12gpercpu
+    slurm_partitions: [sl7]
+    internalnet_interface: eno1
+    ib_interface: ib0
+#    image: gen2normal
+#    networks:
+#      internal: {interface: eno1}
+#      infiniband: {interface: ib0}
+#  ki:
+#    slurm_conf: CoresPerSocket=16 RealMemory=384000 Sockets=2 ThreadsPerCore=1 TmpDisk=330000 Weight=1 Feature=gen2,intel,32cpus,384g,ki,avx512,12gpercpu
+#    slurm_partitions: [main]
+#    image: gen3normal
+#    networks:
+#      internal: {interface: eno1}
+#      omnipath: {interface: ibs6}
+#  enlil:
+#    slurm_conf: CoresPerSocket=16 RealMemory=1536000 Sockets=4 ThreadsPerCore=1 TmpDisk=150000 Weight=10 Feature=intel,24gpercpu,gen2,64cpus,1536g,enlil,avx512
+#    slurm_partitions: [main]
+#    image: gen3normal
+#    networks:
+#      internal: {interface: eno1}
+#      omnipath: {interface: ibs6}
+#  an:
+#    slurm_conf: CoresPerSocket=64 RealMemory=515000 Sockets=2 ThreadsPerCore=1 TmpDisk=865000 Weight=2 Feature=gen3,an,amd,128cpus,500g,4gpercpu
+#    slurm_partitions: [main]
+#    image: gen3normal
+#    networks:
+#      internal: {interface: eno8303}
+#      omnipath: {interface: ibs6}
+#  anu:
+#    slurm_conf: CoresPerSocket=64 RealMemory=1015000 Sockets=2 ThreadsPerCore=1 TmpDisk=865000 Weight=2 Feature=gen3,anu,amd,128cpus,1000g,8gpercpu
+#    slurm_partitions: [main]
+#    image: gen3normal
+#    networks:
+#      internal: {interface: eno8303}
+#      omnipath: {interface: ibs6}
+#  urash:
+#    slurm_conf: CoresPerSocket=64 RealMemory=3015000 Sockets=2 ThreadsPerCore=1 TmpDisk=865000 Weight=2 Feature=gen3,urash,amd,128cpus,3000g,24gpercpu
+#    slurm_partitions: [main]
+#    image: gen3normal
+#    networks:
+#      internal: {interface: eno8303}
+#      omnipath: {interface: ibs6}
+#  nanna:
+#    slurm_conf: CoresPerSocket=32 RealMemory=1015000 Sockets=2 ThreadsPerCore=1 TmpDisk=865000 Weight=2 Feature=gen3,nanna,a100,nvidia_gpu
+#    slurm_partitions: [gpu]
+#    image: gen3gpu_nvidia
+#    networks:
+#      internal: {interface: eno8303}
+#      omnipath: {interface: ibs6}
+#  haya:
+#    slurm_conf: CoresPerSocket=32 RealMemory=1015000 Sockets=2 ThreadsPerCore=1 TmpDisk=865000 Weight=2 Feature=gen3,haya,i210,amd_gpu
+#    slurm_partitions: [gpu]
+#    image: gen3gpu_amd
+#    networks:
+#      internal: {interface: eno8303}
+#      omnipath: {interface: ibs6}
+#  login:
+#    image: gen3login
+#    networks:
+#      external: {interface: ens2} #bond0?
+#      internal: {interface: eno3}
+#      omnipath: {interface: ibs6}
+#  router:
+#    image: gen3router
+#    networks:
+#      internal: {interface: eno3}
+#      infiniband: {interface: ibs2}
+#      omnipath: {interface: ibs6}
+#      gige: {interface: ens2}
 
-images:
-    gen2normal:
-      roles: []
-      path: "{{images_path}}/gen2normal"
-    gen2gpu:
-      roles: []
-      path: "{{images_path}}/gen2gpu"
-    gen2login:
-      roles: []
-      path: "{{images_path}}/gen2login"
-    gen3old:
-      roles: [focal_client]
-      path: "{{images_path}}/gen3old"
-    gen3normal:
-      roles: [focal_omnipath_client]
-      path: "{{images_path}}/gen3normal"
-    gen3login-ib:
-      roles: [focal_login]
-      path: "{{images_path}}/gen3login-ib"
-    gen3login:
-      roles: [focal_omnipath_login]
-      path: "{{images_path}}/gen3login"
-    gen3router:
-      roles: [focal_router]
-      path: "{{images_path}}/gen3router"
-    gen3gpu_amd:
-      roles: [jammy_gpu_amd]
-      path: "{{images_path}}/gen3gpu_amd"
-    gen3gpu_nvidia:
-      roles: [focal_gpu_nvidia]
-      path: "{{images_path}}/gen3gpu_nvidia"
-    gen3archive:
-      roles: [noble_archive]
-      path: "{{images_path}}/gen3archive"
+#- images:
+#    gen2normal:
+#      roles: []
+#      path: "{{images_path}}/gen2normal"
+#    gen2gpu:
+#      roles: []
+#      path: "{{images_path}}/gen2gpu"
+#    gen2login:
+#      roles: []
+#      path: "{{images_path}}/gen2login"
+#    gen3normal:
+#      roles: [focal_client]
+#      path: "{{images_path}}/gen3normal"
+#    gen3login:
+#      roles: [focal_login]
+#      path: "{{images_path}}/gen3login"
+#    gen3router:
+#      roles: [focal_router]
+#      path: "{{images_path}}/gen3router"
+#    gen3gpu_amd:
+#      roles: [jammy_gpu_amd]
+#      path: "{{images_path}}/gen3gpu_amd"
+#    gen3gpu_nvidia:
+#      roles: [focal_gpu_nvidia]
+#      path: "{{images_path}}/gen3gpu_nvidia"
 
 partition_types:
     main:
-      slurm_conf: Default=YES MinNodes=1 DefaultTime=01:00:00 MaxTime=21-00 AllowGroups=ALL PriorityJobFactor=10 PriorityTier=1 DisableRootJobs=YES RootOnly=NO Hidden=NO Shared=NO GraceTime=0 PreemptMode=OFF ReqResv=NO DefMemPerNode=100 AllowAccounts=ALL ExclusiveUser=NO OverSubscribe=NO OverTimeLimit=0 State=UP
-    gpu:
-      slurm_conf: Default=NO  MinNodes=1 DefaultTime=01:00:00 MaxTime=21-00 AllowGroups=ALL PriorityJobFactor=10 PriorityTier=1 DisableRootJobs=YES RootOnly=NO Hidden=NO Shared=NO GraceTime=0 PreemptMode=OFF ReqResv=NO DefMemPerNode=100 AllowAccounts=ALL ExclusiveUser=NO OverSubscribe=NO OverTimeLimit=0 State=UP
+      slurm_conf: Default=YES MinNodes=1 DefaultTime=01:00:00 AllowGroups=ALL PriorityJobFactor=10 PriorityTier=1 DisableRootJobs=YES RootOnly=NO Hidden=NO Shared=NO GraceTime=0 PreemptMode=OFF ReqResv=NO DefMemPerNode=100 AllowAccounts=ALL ExclusiveUser=NO OverSubscribe=NO OverTimeLimit=0 State=UP
 qos_types:
     low:
-      slurm_partitions: [main, gpu]
+      slurm_partitions: [main]
       sacctmgr_conf:
         Priority: 1
         Flags: DenyOnLimit,NoReserve
         GrpTRES: cpu=100,mem=18849160M,node=100
         GrpSubmit: 50000
-        MaxTRESMins: cpu=43200
+        MaxTRESMins: cpu=43200,mem=43200,node=43200
         MaxSubmitJobsPerUser: 10000
         MinTRES: cpu=1
     std:
-      slurm_partitions: [main, gpu]
+      slurm_partitions: [main]
       sacctmgr_conf:
         Priority: 10
         Flags: DenyOnLimit
         GrpTRES: cpu=100,mem=18849160M,node=100
         GrpSubmit: 50000
-        MaxTRESMins: cpu=43200
+        MaxTRESMins: cpu=43200,mem=43200,node=43200
         MaxSubmitJobsPerUser: 10000
         MinTRES: cpu=1
     high:
-      slurm_partitions: [main, gpu]
+      slurm_partitions: [main]
       sacctmgr_conf:
-        Priority: 20
+        Priority: 20  
         Flags: DenyOnLimit
         GrpTRES: cpu=100,mem=18849160M,node=100
         GrpSubmit: 50000
-        MaxTRESMins: cpu=43200
+        MaxTRESMins: cpu=43200,mem=43200,node=43200
         MaxSubmitJobsPerUser: 10000
         MinTRES: cpu=1
 
@@ -1254,18 +1105,6 @@ multipath:
   - {alias: ost20D, wwid: 3600c0ff0006305094aca7d6401000000}
   - {alias: ost20E, wwid: 3600c0ff000630f819bc97d6401000000}
   - {alias: ost20F, wwid: 3600c0ff000631166a0c97d6401000000}
-  - {alias: archive-01, wwid: 3600c0ff00064a05ce8d9ad6701000000}
-  - {alias: archive-02, wwid: 3600c0ff000649f09f2d9ad6701000000}
-  - {alias: archive-03, wwid: 3600c0ff00064a05cfbd9ad6701000000}
-  - {alias: archive-04, wwid: 3600c0ff000649f0902daad6701000000}
-  - {alias: archive-05, wwid: 3600c0ff00064a05c12daad6701000000}
-  - {alias: archive-06, wwid: 3600c0ff000649f0919daad6701000000}
-  - {alias: archive-07, wwid: 3600c0ff000649f77009cac6701000000}
-  - {alias: archive-08, wwid: 3600c0ff00053349a069cac6701000000}
-  - {alias: archive-09, wwid: 3600c0ff000649f77149cac6701000000}
-  - {alias: archive-10, wwid: 3600c0ff00053349a199cac6701000000}
-  - {alias: archive-11, wwid: 3600c0ff000649f77229cac6701000000}
-  - {alias: archive-12, wwid: 3600c0ff00053349a289cac6701000000}
 
 home_path: /home
 shared_path: /shared
@@ -1283,8 +1122,8 @@ letsencrypt_cert_name: "{{networks.external.zone}}"
 shared_fs:
     block_device: /dev/mapper/homeshared
     mount_path: /homeshared
-    mount_type: ext4
-    mount_options: usrquota
+    mount_type: xfs
+    mount_options: uquota
   #  no_move_homes: yes
   #  no_move_shared: yes
   #  no_move_sali: yes
@@ -1294,50 +1133,17 @@ shared_fs:
 client_mounts:
   - { name: home, path: /home, source: "{{shared_master.name}}.{{networks.internal.zone}}:/home", type: "nfs", options: "rsize=32768,wsize=32768,hard,intr,async,_netdev" }
   - { name: shared, path: "{{shared_path}}", source: "{{shared_master.name}}.{{networks.internal.zone}}:{{shared_path}}", type: "nfs", options: "rsize=32768,wsize=32768,hard,intr,async,_netdev" }
-  - { name: lustre, path: /lustre, source: "192.168.32.120@o2ib2:192.168.32.121@o2ib2:/vanir", type: "lustre", options: "rw,_netdev,flock,lazystatfs" }
-#  - { name: temp_lustre, path: /temp_lustre, source: "192.168.32.120@o2ib2:192.168.32.121@o2ib2:/vanir", type: "lustre", options: "rw,_netdev,flock,lazystatfs" }
-#  - { name: lustre, path: /lustre, source: "192.168.2.236@o2ib:192.168.2.237@o2ib:/lustre", type: "lustre", options: "rw,_netdev,flock,lazystatfs" }
-#  - { name: scratch, path: /scratch, source: "192.168.2.49@o2ib:192.168.2.50@o2ib:/scratch", type: "lustre", options: "rw,_netdev,flock,lazystatfs" }
+  - { name: lustre, path: /lustre, source: "192.168.2.236@o2ib:192.168.2.237@o2ib:/lustre", type: "lustre", options: "rw,_netdev,flock,lazystatfs" }
+  - { name: scratch, path: /scratch, source: "192.168.2.49@o2ib:192.168.2.50@o2ib:/scratch", type: "lustre", options: "rw,_netdev,flock,lazystatfs" }
 
 login_mounts:
   - { name: home, path: /home, source: "{{shared_master.name}}.{{networks.omnipath.zone}}:/home", type: "nfs", options: "rsize=32768,wsize=32768,hard,intr,async,_netdev" }
   - { name: shared, path: "{{shared_path}}", source: "{{shared_master.name}}.{{networks.omnipath.zone}}:{{shared_path}}", type: "nfs", options: "rsize=32768,wsize=32768,hard,intr,async,_netdev" }
-  - { name: lustre, path: /lustre, source: "192.168.32.120@o2ib2:192.168.32.121@o2ib2:/vanir", type: "lustre", options: "rw,_netdev,flock,lazystatfs" }
+  - { name: lustre, path: /lustre, source: "192.168.2.236@o2ib:192.168.2.237@o2ib:/lustre", type: "lustre", options: "rw,_netdev,flock,lazystatfs" }
   - { name: archive, path: /archive, source: "fs02nfs.wurnet.nl:/nfs~hpc-ag-archive", type: "nfs", options: "sec=sys,nfsvers=4.0,rsize=32768,wsize=32768,hard,intr,async,_netdev,actimeo=0" }
 
-archive_mounts:
-  - { name: home, path: /home, source: "{{shared_master.name}}.{{networks.internal.zone}}:/home", type: "nfs", options: "rsize=32768,wsize=32768,hard,intr,async,_netdev" }
-  - { name: shared, path: "{{shared_path}}", source: "{{shared_master.name}}.{{networks.internal.zone}}:{{shared_path}}", type: "nfs", options: "rsize=32768,wsize=32768,hard,intr,async,_netdev" }
-  - { name: archive, path: "{{archive_path}}", source: /dev/mapper/VGarchive-LVarchive, type: "ext4", options: "" }
-
-splunkforwarder_instance_ids:
-  - name: master200
-    guid: 5581067B-E08C-4750-B639-5F8B6246AD80
-  - name: master201
-    guid: 8D1B5AD7-93FD-41DF-AF88-A10A93402D25
-  - name: login200
-    guid: 4EE367E2-C551-4958-845A-BCD22CF09260
-  - name: login201
-    guid: 411E900D-EBF8-4B6A-AC7E-111BF729B38A
-  - name: login202
-    guid: F631FD3C-6EF5-441D-9B9F-C4AC657BB958
-  - name: login0
-    guid: 3BAD2C4E-B554-4511-9F02-287BB80ED9AB
-  - name: login2
-    guid: D5FDA0AC-719F-4CE1-B42E-55B427E9AD82
-  - name: aesir-master0
-    guid: 062261EE-D652-4C1D-B9A0-9F928A8149A5
-  - name: aesir-master1
-    guid: ED977705-3308-4805-A19B-E89BA9DC376E
-  - name: app-clc
-    guid: EAB82FD2-2AE1-4E81-807F-82AC200AEA3E
-
-splunkforwarder_id: 980
-splunkforwarder_targetUri: deployment.surfsoc.nl:8089
-splunkforwarder_URL: "https://download.splunk.com/products/universalforwarder/releases/9.1.7/linux/splunkforwarder-9.1.7-e17104057ef0-Linux-x86_64.tgz"
-
 internal_dc: "dc={{cluster_name | replace('.', ',dc=')}}"
-internal_ca_subject_base: "/C=NL/ST=Gelderland/L=Wageningen/O=Wageningen U&R/OU=VANIR"
+internal_ca_subject_base: "/C=NL/ST=Gelderland/L=Wageningen/O=Wageningen U&R/OU=AESIR"
 
 ad_domain: wurnet.nl
 ad_workgroup: WUR
@@ -1351,16 +1157,16 @@ ad_createcomputer_path: Servers/NoPolicy/Agrogenomics
 postfix_relayhost: "[smtp.wur.nl]:587"
 postfix_noreply_address: "noreply-hpc@wur.nl"
 postfix_allowed_send_addresses:
-  - "slurm@vanir.wur.nl"
-  - "slurm@master.vanir.wur.nl"
-  - "root@vanir.wur.nl"
-  - "root@master.vanir.wur.nl"
+  - "slurm@aesir.wurnet.nl"
+  - "slurm@master.aesir.wurnet.nl"
+  - "root@aesir.wurnet.nl"
+  - "root@master.aesir.wurnet.nl"
   - "hpc.beheer@wur.nl"
 postfix_rewrite_noreply_list:
-  - "slurm@vanir.wur.nl"
-  - "slurm@master.vanir.wur.nl"
-  - "root@vanir.wur.nl"
-  - "root@master.vanir.wur.nl"
+  - "slurm@aesir.wurnet.nl"
+  - "slurm@master.aesir.wurnet.nl"
+  - "root@aesir.wurnet.nl"
+  - "root@master.aesir.wurnet.nl"
 
 corosync_cluster_name: "{{ shared_master.name }}"
 keycloak_fqdn: "auth.{{ networks.external.zone }}"
@@ -1376,6 +1182,14 @@ slurm_user:
     homedir: "{{apps_path}}/slurm/current"
     shell: /sbin/nologin
 
+postgres_user:
+    username: postgres
+    uid: 2050
+    groupname: postgres
+    gid: 2050
+    homedir: /opt/postgres/current
+    shell: /sbin/nologin
+
 apps_user:
     username: builder
     uid: 1274