Commit 751df1a44877

@@ -55,7 +55,6 @@ in
 
     # Machines without wildcards
     hokkaido.A = [ (builtins.head globals.machines.hokkaido.net.ips) ];
-    kobe.A = [ (builtins.head globals.machines.kobe.net.ips) ];
     synodine.A = [ (builtins.head globals.machines.synodine.net.ips) ];
 
     # Hardcoded entries not in globals or incomplete in globals
@@ -67,70 +66,70 @@ in
     remakrable.A = [ "192.168.1.57" ];
     hass.A = [ "192.168.1.181" ];
 
-    # OpenShift infrastructure
-    vm0.A = [ "192.168.1.120" ];
-    vm1.A = [ "192.168.1.121" ];
-    vm2.A = [ "192.168.1.122" ];
-    vm3.A = [ "192.168.1.123" ];
-    vm4.A = [ "192.168.1.124" ];
-    vm5.A = [ "192.168.1.125" ];
-    vm6.A = [ "192.168.1.126" ];
-    vm7.A = [ "192.168.1.127" ];
-    vm8.A = [ "192.168.1.128" ];
-    vm9.A = [ "192.168.1.129" ];
-
-    ocp = {
-      subdomains = {
-        api.A = [ "192.168.1.120" ];
-        api-int.A = [ "192.168.1.120" ];
-        apps.subdomains."*".A = [ "192.168.1.120" ];
-        master0.A = [ "192.168.1.121" ];
-        master1.A = [ "192.168.1.122" ];
-        master3.A = [ "192.168.1.123" ];
-        worker1.A = [ "192.168.1.124" ];
-        worker2.A = [ "192.168.1.125" ];
-        worker3.A = [ "192.168.1.126" ];
-        worker4.A = [ "192.168.1.127" ];
-        worker5.A = [ "192.168.1.128" ];
-        bootstrap.A = [ "192.168.1.129" ];
-        etcd-0.A = [ "192.168.1.121" ];
-        etcd-1.A = [ "192.168.1.122" ];
-        etcd-2.A = [ "192.168.1.123" ];
-      };
-      SRV = [
-        {
-          service = "etcd-server-ssl";
-          proto = "tcp";
-          priority = 0;
-          weight = 10;
-          port = 2380;
-          target = "etcd-0.ocp.home.";
-        }
-        {
-          service = "etcd-server-ssl";
-          proto = "tcp";
-          priority = 0;
-          weight = 10;
-          port = 2380;
-          target = "etcd-1.ocp.home.";
-        }
-        {
-          service = "etcd-server-ssl";
-          proto = "tcp";
-          priority = 0;
-          weight = 10;
-          port = 2380;
-          target = "etcd-2.ocp.home.";
-        }
-      ];
-    };
-
-    # k8s nodes
-    ubnt1.A = [ "192.168.1.130" ];
-    ubnt2.A = [ "192.168.1.131" ];
-    k8sn1.A = [ "192.168.1.130" ];
-    k8sn2.A = [ "192.168.1.131" ];
-    k8sn3.A = [ "192.168.1.132" ];
+    #   # OpenShift infrastructure
+    #   vm0.A = [ "192.168.1.120" ];
+    #   vm1.A = [ "192.168.1.121" ];
+    #   vm2.A = [ "192.168.1.122" ];
+    #   vm3.A = [ "192.168.1.123" ];
+    #   vm4.A = [ "192.168.1.124" ];
+    #   vm5.A = [ "192.168.1.125" ];
+    #   vm6.A = [ "192.168.1.126" ];
+    #   vm7.A = [ "192.168.1.127" ];
+    #   vm8.A = [ "192.168.1.128" ];
+    #   vm9.A = [ "192.168.1.129" ];
+    #
+    #   ocp = {
+    #     subdomains = {
+    #       api.A = [ "192.168.1.120" ];
+    #       api-int.A = [ "192.168.1.120" ];
+    #       apps.subdomains."*".A = [ "192.168.1.120" ];
+    #       master0.A = [ "192.168.1.121" ];
+    #       master1.A = [ "192.168.1.122" ];
+    #       master3.A = [ "192.168.1.123" ];
+    #       worker1.A = [ "192.168.1.124" ];
+    #       worker2.A = [ "192.168.1.125" ];
+    #       worker3.A = [ "192.168.1.126" ];
+    #       worker4.A = [ "192.168.1.127" ];
+    #       worker5.A = [ "192.168.1.128" ];
+    #       bootstrap.A = [ "192.168.1.129" ];
+    #       etcd-0.A = [ "192.168.1.121" ];
+    #       etcd-1.A = [ "192.168.1.122" ];
+    #       etcd-2.A = [ "192.168.1.123" ];
+    #     };
+    #     SRV = [
+    #       {
+    #         service = "etcd-server-ssl";
+    #         proto = "tcp";
+    #         priority = 0;
+    #         weight = 10;
+    #         port = 2380;
+    #         target = "etcd-0.ocp.home.";
+    #       }
+    #       {
+    #         service = "etcd-server-ssl";
+    #         proto = "tcp";
+    #         priority = 0;
+    #         weight = 10;
+    #         port = 2380;
+    #         target = "etcd-1.ocp.home.";
+    #       }
+    #       {
+    #         service = "etcd-server-ssl";
+    #         proto = "tcp";
+    #         priority = 0;
+    #         weight = 10;
+    #         port = 2380;
+    #         target = "etcd-2.ocp.home.";
+    #       }
+    #     ];
+    #   };
+    #
+    #   # k8s nodes
+    #   ubnt1.A = [ "192.168.1.130" ];
+    #   ubnt2.A = [ "192.168.1.131" ];
+    #   k8sn1.A = [ "192.168.1.130" ];
+    #   k8sn2.A = [ "192.168.1.131" ];
+    #   k8sn3.A = [ "192.168.1.132" ];
   }
   // mkHomeMachineRecords;
 }

@@ -51,10 +51,6 @@ in
     ns1.A = [ (builtins.head globals.machines.shikoku.net.vpn.ips) ];
     ns2.A = [ (builtins.head globals.machines.sakhalin.net.vpn.ips) ];
 
-    # Cache/Massimo wildcards - these don't exist in globals, keeping hardcoded
-    cache.subdomains."*".A = [ "10.100.0.6" ];
-    massimo.subdomains."*".A = [ "10.100.0.6" ];
-
     # hass - hardcoded as it's not in the machine list
     hass.A = [ "10.100.0.81" ];
   }