Skip to content

Commit 3e94daa

Browse files
authored
sled-agent-config-reconciler: Write OS phase 2 images (PR 3/4) (#8540)
With this PR, the config reconciler will actually copy OS phase 2 images from the TUF repo depot onto the boot partitions of M.2 drives, if specified to by its `OmicronSledConfig`. It reuses the raw disk writer from installinator, so _most_ of the new code here is test (or test support).
1 parent cddd41e commit 3e94daa

File tree

14 files changed

+923
-158
lines changed

14 files changed

+923
-158
lines changed

Cargo.lock

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sled-agent/config-reconciler/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ glob.workspace = true
2323
id-map.workspace = true
2424
iddqd.workspace = true
2525
illumos-utils.workspace = true
26+
installinator-common.workspace = true
2627
key-manager.workspace = true
2728
nexus-sled-agent-shared.workspace = true
2829
omicron-common.workspace = true

sled-agent/config-reconciler/src/handle.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ impl ConfigReconcilerHandle {
197197
/// shenanigans to get a second [`ConfigReconcilerSpawnToken`].
198198
pub fn spawn_reconciliation_task<
199199
T: SledAgentFacilities,
200-
U: SledAgentArtifactStore,
200+
U: SledAgentArtifactStore + Clone,
201201
>(
202202
&self,
203203
sled_agent_facilities: T,
@@ -219,7 +219,7 @@ impl ConfigReconcilerHandle {
219219
let (ledger_task, current_config_rx) =
220220
LedgerTaskHandle::spawn_ledger_task(
221221
self.internal_disks_rx.clone(),
222-
sled_agent_artifact_store,
222+
sled_agent_artifact_store.clone(),
223223
ledger_task_log,
224224
);
225225
match self.ledger_task.set(ledger_task) {
@@ -247,6 +247,7 @@ impl ConfigReconcilerHandle {
247247
raw_disks_rx,
248248
Arc::clone(&self.destroy_orphans),
249249
sled_agent_facilities,
250+
sled_agent_artifact_store,
250251
reconciler_task_log,
251252
);
252253
}

0 commit comments

Comments
 (0)