From aa14f533e3477fba29f828c6547058b1c55d7468 Mon Sep 17 00:00:00 2001 From: Sean Klein Date: Tue, 8 Nov 2022 11:22:57 -0500 Subject: [PATCH] Simplify nexus notifications --- sled-agent/src/sled_agent.rs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sled-agent/src/sled_agent.rs b/sled-agent/src/sled_agent.rs index d465a8c13a..4cc5d65ad7 100644 --- a/sled-agent/src/sled_agent.rs +++ b/sled-agent/src/sled_agent.rs @@ -398,6 +398,10 @@ impl SledAgent { match hardware_updates.recv().await { Ok(update) => match update { crate::hardware::HardwareUpdate::TofinoDeviceChange => { + // Inform Nexus that we're now a scrimlet, instead of a Gimlet. + // + // This won't block on Nexus responding; it may take while before + // Nexus actually comes online. self.notify_nexus_about_self(&log); } crate::hardware::HardwareUpdate::TofinoLoaded => { @@ -420,12 +424,6 @@ impl SledAgent { } async fn ensure_scrimlet_services_active(&self, log: &Logger) { - // Inform Nexus that we're now a scrimlet, instead of a Gimlet. - // - // This won't block on Nexus responding; it may take while before - // Nexus actually comes online. - self.notify_nexus_about_self(log); - // TODO(https://github.com/oxidecomputer/omicron/issues/823): Launch the switch zone, with // Dendrite, MGS, and any other services we want to enable. warn!(log, "Activating scrimlet services not yet implemented");