pmcf 1.59.12 → 1.60.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "1.59.12",
+  "version": "1.60.0",
   "publishConfig": {
     "access": "public"
   },

package/src/cluster.mjs

@@ -11,6 +11,7 @@ const ClusterTypeDefinition = {
   priority: 0.7,
   extends: Owner.typeDefinition,
   properties: {
+    routerId: { type: "number", collection: false, writeable: true },
     masters: { type: "network_interface", collection: true, writeable: true },
     backups: { type: "network_interface", collection: true, writeable: true }
   }
@@ -19,6 +20,7 @@ const ClusterTypeDefinition = {
 export class Cluster extends Host {
   #masters = new Set();
   #backups = new Set();
+  routerId = 100;
 
   static {
     addType(this);
@@ -50,6 +52,7 @@ export class Cluster extends Host {
   }
 
   async *preparePackages(stagingDir) {
+    
     const result = {
       sources: [],
       outputs: this.outputs,
@@ -58,26 +61,36 @@ export class Cluster extends Host {
         access: "private"
       }
     };
+  
+    let interfaces = new Set();
 
-    for (const ni of this.masters.union(this.backups)) {
-      const name = `${this.typeName}-${this.owner.name}-${this.name}-${ni.host.name}`;
+    for(const cluster of this.owner.clusters()) {
+      interfaces = interfaces.union(cluster.masters.union(cluster.backups));
+    }
+
+    for (const ni of interfaces) {
+      const name = `keepalived-${ni.host.name}`;
       const packageStagingDir = join(stagingDir, name);
-      const cfg = [
-        `vrrp_instance ${this.name} {`,
-        `  state ${this.masters.has(ni) ? "MASTER" : "BACKUP"}`,
-        `  interface ${ni.name}`,
-        "  virtual_router_id 101",
-        "  priority 255",
-        "  advert_int 1",
-        "  authentication {",
-        "    auth_type PASS",
-        "    auth_pass pass1234",
-        "  }",
-        "  virtual_ipaddress {",
-        `    ${this.rawAddress}`,
-        "  }",
-        "}"
-      ];
+  
+      const cfg = [];
+
+      for(const cluster of this.owner.clusters()) {
+        cfg.push(`vrrp_instance ${cluster.name} {`);
+        cfg.push(`  state ${cluster.masters.has(ni) ? "MASTER" : "BACKUP"}`);
+        cfg.push(`  interface ${ni.name}`,);
+        cfg.push("  virtual_ipaddress {");
+        cfg.push(`    ${cluster.rawAddress}`);
+        cfg.push("  }");
+        cfg.push(`  virtual_router_id ${this.routerId}`);
+        cfg.push("  priority 255");
+        cfg.push("  advert_int 1");
+        cfg.push("  authentication {");
+        cfg.push("    auth_type PASS");
+        cfg.push("    auth_pass pass1234");
+        cfg.push("  }");
+        cfg.push("}");
+        cfg.push("");
+      }
 
       await writeLines(
         join(packageStagingDir, "etc/keepalived"),
@@ -87,6 +100,7 @@ export class Cluster extends Host {
 
       result.properties.name = name;
       result.properties.dependencies = ["keepalived"];
+      result.properties.replaces = [`${this.typeName}-${this.owner.name}-${this.name}-${ni.host.name}`];
 
       result.sources.push(
         new FileContentProvider(packageStagingDir + "/")[Symbol.asyncIterator]()

package/types/cluster.d.mts

@@ -359,6 +359,11 @@ export class Cluster extends Host {
             };
         };
         properties: {
+            routerId: {
+                type: string;
+                collection: boolean;
+                writeable: boolean;
+            };
             masters: {
                 type: string;
                 collection: boolean;
@@ -371,6 +376,7 @@ export class Cluster extends Host {
             };
         };
     };
+    routerId: number;
     set masters(value: Set<any>);
     get masters(): Set<any>;
     set backups(value: Set<any>);