[meta] update checked in schemas (#3744)

Changes to omicron that raced with #3715.
oxidecomputer · Jul 22, 2023 · d3c7d8d · d3c7d8d
1 parent ee95245
commit d3c7d8d
Show file tree

Hide file tree

Showing 5 changed files with 131 additions and 9 deletions.
diff --git a/schema/all-zone-requests.json b/schema/all-zone-requests.json
@@ -291,13 +291,22 @@
         {
           "type": "object",
           "required": [
+            "external_dns_servers",
             "external_ip",
             "external_tls",
             "internal_address",
             "nic",
             "type"
           ],
           "properties": {
+            "external_dns_servers": {
+              "description": "External DNS servers Nexus can use to resolve external hosts.",
+              "type": "array",
+              "items": {
+                "type": "string",
+                "format": "ip"
+              }
+            },
             "external_ip": {
               "description": "The address at which the external nexus server is reachable.",
               "type": "string",
@@ -448,7 +457,8 @@
             "dns_servers": {
               "type": "array",
               "items": {
-                "type": "string"
+                "type": "string",
+                "format": "ip"
               }
             },
             "domain": {
@@ -502,7 +512,8 @@
             "dns_servers": {
               "type": "array",
               "items": {
-                "type": "string"
+                "type": "string",
+                "format": "ip"
               }
             },
             "domain": {

diff --git a/schema/deployment-config.json b/schema/deployment-config.json
@@ -4,6 +4,7 @@
   "type": "object",
   "required": [
     "database",
+    "external_dns_servers",
     "id",
     "internal_dns",
     "rack_id"
@@ -17,6 +18,14 @@
         }
       ]
     },
+    "external_dns_servers": {
+      "description": "External DNS servers Nexus can use to resolve external hosts.",
+      "type": "array",
+      "items": {
+        "type": "string",
+        "format": "ip"
+      }
+    },
     "id": {
       "description": "Uuid of the Nexus instance",
       "type": "string",

diff --git a/schema/persistent-sled-agent-request.json b/schema/persistent-sled-agent-request.json
@@ -40,14 +40,16 @@
         "id",
         "ntp_servers",
         "rack_id",
-        "subnet"
+        "subnet",
+        "use_trust_quorum"
       ],
       "properties": {
         "dns_servers": {
           "description": "The external DNS servers to use",
           "type": "array",
           "items": {
-            "type": "string"
+            "type": "string",
+            "format": "ip"
           }
         },
         "id": {
@@ -74,6 +76,10 @@
               "$ref": "#/definitions/Ipv6Subnet"
             }
           ]
+        },
+        "use_trust_quorum": {
+          "description": "Use trust quorum for key generation",
+          "type": "boolean"
         }
       }
     }

diff --git a/schema/rss-service-plan.json b/schema/rss-service-plan.json
@@ -391,13 +391,22 @@
         {
           "type": "object",
           "required": [
+            "external_dns_servers",
             "external_ip",
             "external_tls",
             "internal_address",
             "nic",
             "type"
           ],
           "properties": {
+            "external_dns_servers": {
+              "description": "External DNS servers Nexus can use to resolve external hosts.",
+              "type": "array",
+              "items": {
+                "type": "string",
+                "format": "ip"
+              }
+            },
             "external_ip": {
               "description": "The address at which the external nexus server is reachable.",
               "type": "string",
@@ -548,7 +557,8 @@
             "dns_servers": {
               "type": "array",
               "items": {
-                "type": "string"
+                "type": "string",
+                "format": "ip"
               }
             },
             "domain": {
@@ -602,7 +612,8 @@
             "dns_servers": {
               "type": "array",
               "items": {
-                "type": "string"
+                "type": "string",
+                "format": "ip"
               }
             },
             "domain": {

diff --git a/schema/rss-sled-plan.json b/schema/rss-sled-plan.json
@@ -23,6 +23,74 @@
     }
   },
   "definitions": {
+    "Baseboard": {
+      "description": "Describes properties that should uniquely identify a Gimlet.",
+      "oneOf": [
+        {
+          "type": "object",
+          "required": [
+            "identifier",
+            "model",
+            "revision",
+            "type"
+          ],
+          "properties": {
+            "identifier": {
+              "type": "string"
+            },
+            "model": {
+              "type": "string"
+            },
+            "revision": {
+              "type": "integer",
+              "format": "int64"
+            },
+            "type": {
+              "type": "string",
+              "enum": [
+                "gimlet"
+              ]
+            }
+          }
+        },
+        {
+          "type": "object",
+          "required": [
+            "type"
+          ],
+          "properties": {
+            "type": {
+              "type": "string",
+              "enum": [
+                "unknown"
+              ]
+            }
+          }
+        },
+        {
+          "type": "object",
+          "required": [
+            "identifier",
+            "model",
+            "type"
+          ],
+          "properties": {
+            "identifier": {
+              "type": "string"
+            },
+            "model": {
+              "type": "string"
+            },
+            "type": {
+              "type": "string",
+              "enum": [
+                "pc"
+              ]
+            }
+          }
+        }
+      ]
+    },
     "BootstrapAddressDiscovery": {
       "oneOf": [
         {
@@ -222,7 +290,8 @@
           "description": "The external DNS server addresses.",
           "type": "array",
           "items": {
-            "type": "string"
+            "type": "string",
+            "format": "ip"
           }
         },
         "external_certificates": {
@@ -280,6 +349,16 @@
               "$ref": "#/definitions/RecoverySiloConfig"
             }
           ]
+        },
+        "trust_quorum_peers": {
+          "description": "The set of peer_ids required to initialize trust quorum\n\nThe value is `None` if we are not using trust quorum",
+          "type": [
+            "array",
+            "null"
+          ],
+          "items": {
+            "$ref": "#/definitions/Baseboard"
+          }
         }
       }
     },
@@ -338,14 +417,16 @@
         "id",
         "ntp_servers",
         "rack_id",
-        "subnet"
+        "subnet",
+        "use_trust_quorum"
       ],
       "properties": {
         "dns_servers": {
           "description": "The external DNS servers to use",
           "type": "array",
           "items": {
-            "type": "string"
+            "type": "string",
+            "format": "ip"
           }
         },
         "id": {
@@ -372,6 +453,10 @@
               "$ref": "#/definitions/Ipv6Subnet"
             }
           ]
+        },
+        "use_trust_quorum": {
+          "description": "Use trust quorum for key generation",
+          "type": "boolean"
         }
       }
     },