ERP5: "cluster" is not required in NEO parameters

software/erp5/instance-erp5-input-schema.json

@@ -318,7 +318,7 @@
               },
               "server": {
                 "description": "Instantiate a server. If missing, 'storage-dict' must contain the necessary properties to mount the ZODB. Partitions references are 'neo-0', 'neo-1', ...",
-                "$ref": "../neoppod/instance-neo-input-schema.json"
+                "$ref": "../neoppod/instance-neo-input-schema.json#/definitions/neo-cluster"
               }
             }
           }

software/neoppod/instance-neo-input-schema.json

 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "description": "Parameters to instantiate a NEO cluster. See https://lab.nexedi.com/nexedi/neoppod/blob/master/neo.conf for more information.",
+  "definitions": {
+    "neo-cluster": {
       "additionalProperties": false,
-  "required": [
-    "cluster"
-  ],
       "properties": {
         "cluster": {
           "description": "Cluster unique identifier. Your last line of defense against mixing up NEO clusters and corrupting your data. Choose a unique value for each of your cluster. Space not allowed.",
@@ -149,7 +148,7 @@
               {
                 "allOf": [
                   {
-                    "$ref": "#/properties/node"
+                    "$ref": "#/definitions/neo-cluster/properties/node"
                   },
                   {
                     "description": "Override value (parameters for maching nodes)."
@@ -163,4 +162,16 @@
         }
       },
       "type": "object"
+    }
+  },
+  "allOf": [
+    {
+      "$ref": "#/definitions/neo-cluster"
+    },
+    {
+      "required": [
+        "cluster"
+      ]
+    }
+  ]
 }