diff --git a/schema/all-zones-requests.json b/schema/all-zones-requests.json index 526e41376f..1a12e20c91 100644 --- a/schema/all-zones-requests.json +++ b/schema/all-zones-requests.json @@ -233,6 +233,17 @@ "zone_type" ], "properties": { + "filesystem_pool": { + "description": "The pool on which we'll place this zone's filesystem.\n\nNote that this is transient -- the sled agent is permitted to destroy the zone's dataset on this pool each time the zone is initialized.", + "anyOf": [ + { + "$ref": "#/definitions/ZpoolName" + }, + { + "type": "null" + } + ] + }, "id": { "type": "string", "format": "uuid" diff --git a/sled-agent/src/services.rs b/sled-agent/src/services.rs index dcb0ddfbb3..619a6b7e77 100644 --- a/sled-agent/src/services.rs +++ b/sled-agent/src/services.rs @@ -4362,6 +4362,7 @@ mod test { id, underlay_address: Ipv6Addr::LOCALHOST, zone_type, + filesystem_pool: None, }], }, Some(&tmp_dir), @@ -4393,6 +4394,7 @@ mod test { dns_servers: vec![], domain: None, }, + filesystem_pool: None, }], }, Some(&tmp_dir), @@ -4809,6 +4811,7 @@ mod test { dns_servers: vec![], domain: None, }, + filesystem_pool: None, }]; let tmp_dir = String::from(test_config.config_dir.path().as_str()); @@ -4837,6 +4840,7 @@ mod test { dns_servers: vec![], domain: None, }, + filesystem_pool: None, }); // Now try to apply that list with an older generation number. This