fixups from changes on main

Author: jgallagher

nexus/db-queries/src/db/datastore/deployment.rs

@@ -2537,7 +2537,6 @@ mod tests {
                 zones: vec![BlueprintZoneConfig {
                     disposition: BlueprintZoneDisposition::InService,
                     id: zone_id,
-                    underlay_address: Ipv6Addr::LOCALHOST,
                     filesystem_pool: None,
                     zone_type: BlueprintZoneType::Nexus(
                         blueprint_zone_type::Nexus {

nexus/reconfigurator/planning/src/blueprint_builder/builder.rs

@@ -1177,7 +1177,6 @@ impl<'a> BlueprintBuilder<'a> {
             let zone = BlueprintZoneConfig {
                 disposition: BlueprintZoneDisposition::InService,
                 id: oximeter_id,
-                underlay_address: ip,
                 filesystem_pool: Some(filesystem_pool),
                 zone_type,
             };
@@ -1284,7 +1283,6 @@ impl<'a> BlueprintBuilder<'a> {
             let zone = BlueprintZoneConfig {
                 disposition: BlueprintZoneDisposition::InService,
                 id: zone_id,
-                underlay_address: underlay_ip,
                 filesystem_pool: Some(filesystem_pool),
                 zone_type,
             };
@@ -1340,7 +1338,6 @@ impl<'a> BlueprintBuilder<'a> {
             let zone = BlueprintZoneConfig {
                 disposition: BlueprintZoneDisposition::InService,
                 id: zone_id,
-                underlay_address: underlay_ip,
                 filesystem_pool: Some(filesystem_pool),
                 zone_type,
             };