diff --git a/nexus/deployment/src/planner.rs b/nexus/deployment/src/planner.rs index 10303d223a..2c054b8cb5 100644 --- a/nexus/deployment/src/planner.rs +++ b/nexus/deployment/src/planner.rs @@ -223,9 +223,8 @@ impl<'a> Planner<'a> { // keys, expecting to stop on the first iteration, with the only // exception being when we've removed all the sleds from a bin. for (&num_nexus, sleds) in sleds_by_num_nexus.iter_mut() { - // TODO choose more smartly than effectively ordering by - // sled_id? See - // https://github.com/oxidecomputer/omicron/pull/4959#discussion_r1476795735. + // `sleds` contains all sleds with the minimum number of Nexus + // zones. Pick one arbitrarily but deterministically. let Some(sled_id) = sleds.pop() else { // We already drained this bin; move on. continue; diff --git a/nexus/types/src/deployment.rs b/nexus/types/src/deployment.rs index 4798d54afa..7438e2199a 100644 --- a/nexus/types/src/deployment.rs +++ b/nexus/types/src/deployment.rs @@ -57,10 +57,6 @@ pub struct Policy { pub service_ip_pool_ranges: Vec, /// desired total number of deployed Nexus zones - // This number probably doesn't make sense alone once we get to a world - // where we're deploying multiple _versions_ of Nexus and need to ensure a - // minimum number in service at any given time, but for now all we know how - // to do is deploy a fixed number of all-the-same-version. pub target_nexus_zone_count: usize, }