Skip to content

Commit 071b5d1

Browse files
sunshowerssunshowers
committed
rebase on main
Created using spr 1.3.6-beta.1
2 parents 9421ac2 + 1d02ed3 commit 071b5d1

24 files changed

+1998
-114
lines changed

‎Cargo.lock‎

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

‎Cargo.toml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -414,10 +414,10 @@ crossterm = { version = "0.29.0", features = ["event-stream"] }
414414
# NOTE: if you change the pinned revision of the `crucible` dependencies, you
415415
# must also update the references in package-manifest.toml to match the new
416416
# revision.
417-
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "75ea3408643664877aa603ffc65996ed6dc34c0a" }
418-
crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "75ea3408643664877aa603ffc65996ed6dc34c0a" }
419-
crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "75ea3408643664877aa603ffc65996ed6dc34c0a" }
420-
crucible-common = { git = "https://github.com/oxidecomputer/crucible", rev = "75ea3408643664877aa603ffc65996ed6dc34c0a" }
417+
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "7103cd3a3d7b0112d2949dd135db06fef0c156bb" }
418+
crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "7103cd3a3d7b0112d2949dd135db06fef0c156bb" }
419+
crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "7103cd3a3d7b0112d2949dd135db06fef0c156bb" }
420+
crucible-common = { git = "https://github.com/oxidecomputer/crucible", rev = "7103cd3a3d7b0112d2949dd135db06fef0c156bb" }
421421
# NOTE: See above!
422422
csv = "1.3.1"
423423
curve25519-dalek = "4"
@@ -645,10 +645,10 @@ progenitor-client = "0.10.0"
645645
# NOTE: if you change the pinned revision of the `bhyve_api` and propolis
646646
# dependencies, you must also update the references in package-manifest.toml to
647647
# match the new revision.
648-
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "aaa51291b747928a1d69e4b6059a54163d4d2e6d" }
649-
propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev = "aaa51291b747928a1d69e4b6059a54163d4d2e6d" }
650-
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "aaa51291b747928a1d69e4b6059a54163d4d2e6d" }
651-
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "aaa51291b747928a1d69e4b6059a54163d4d2e6d" }
648+
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "3f1752e6cee9a2f8ecdce6e2ad3326781182e2d9" }
649+
propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev = "3f1752e6cee9a2f8ecdce6e2ad3326781182e2d9" }
650+
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "3f1752e6cee9a2f8ecdce6e2ad3326781182e2d9" }
651+
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "3f1752e6cee9a2f8ecdce6e2ad3326781182e2d9" }
652652
# NOTE: see above!
653653
proptest = "1.7.0"
654654
qorb = "0.4.1"

‎dev-tools/omdb/src/bin/omdb/db.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2999,7 +2999,7 @@ fn print_vcr(vcr: VolumeConstructionRequest, pad: usize) {
29992999
bs: String,
30003000
bpe: u64,
30013001
ec: u32,
3002-
gen: u64,
3002+
generation: u64,
30033003
read_only: bool,
30043004
}
30053005

@@ -3045,15 +3045,15 @@ fn print_vcr(vcr: VolumeConstructionRequest, pad: usize) {
30453045
block_size,
30463046
blocks_per_extent,
30473047
extent_count,
3048-
gen,
3048+
generation,
30493049
opts,
30503050
} => {
30513051
let row = VCRRegion {
30523052
id: opts.id.to_string(),
30533053
bs: block_size.to_string(),
30543054
bpe: blocks_per_extent,
30553055
ec: extent_count,
3056-
gen,
3056+
generation,
30573057
read_only: opts.read_only,
30583058
};
30593059
let table = tabled::Table::new(&[row])

‎dev-tools/reconfigurator-cli/tests/output/cmds-mupdate-update-flow-stdout‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ done: <REDACTED_TIMESTAMP>
121121
errors: 0
122122

123123
Sled serial0
124-
part number: model0
124+
part number: 913-0000019
125125
power: A2
126126
revision: 0
127127
MGS slot: Sled 0
@@ -146,7 +146,7 @@ Sled serial0
146146
RoT: slot B SHA3-256: slotBdigest1
147147

148148
Sled serial1
149-
part number: model1
149+
part number: 913-0000019
150150
power: A2
151151
revision: 0
152152
MGS slot: Sled 1
@@ -171,7 +171,7 @@ Sled serial1
171171
RoT: slot B SHA3-256: slotBdigest1
172172

173173
Sled serial2
174-
part number: model2
174+
part number: 913-0000019
175175
power: A2
176176
revision: 0
177177
MGS slot: Sled 2

‎dev-tools/reconfigurator-cli/tests/output/cmds-nexus-generation-autobump-stdout‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ done: <REDACTED_TIMESTAMP>
447447
errors: 0
448448

449449
Sled serial0
450-
part number: model0
450+
part number: 913-0000019
451451
power: A2
452452
revision: 0
453453
MGS slot: Sled 0
@@ -473,7 +473,7 @@ Sled serial0
473473
RoT: slot B SHA3-256: slotBdigest1
474474

475475
Sled serial1
476-
part number: model1
476+
part number: 913-0000019
477477
power: A2
478478
revision: 0
479479
MGS slot: Sled 1
@@ -499,7 +499,7 @@ Sled serial1
499499
RoT: slot B SHA3-256: slotBdigest1
500500

501501
Sled serial2
502-
part number: model2
502+
part number: 913-0000019
503503
power: A2
504504
revision: 0
505505
MGS slot: Sled 2

‎dev-tools/reconfigurator-cli/tests/output/cmds-target-release-stdout‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ done: <REDACTED_TIMESTAMP>
436436
errors: 0
437437

438438
Sled serial0
439-
part number: model0
439+
part number: 913-0000019
440440
power: A2
441441
revision: 0
442442
MGS slot: Sled 0
@@ -461,7 +461,7 @@ Sled serial0
461461
RoT: slot B SHA3-256: slotBdigest1
462462

463463
Sled serial1
464-
part number: model1
464+
part number: 913-0000019
465465
power: A2
466466
revision: 0
467467
MGS slot: Sled 1
@@ -486,7 +486,7 @@ Sled serial1
486486
RoT: slot B SHA3-256: slotBdigest1
487487

488488
Sled serial2
489-
part number: model2
489+
part number: 913-0000019
490490
power: A2
491491
revision: 0
492492
MGS slot: Sled 2

‎dev-tools/reconfigurator-cli/tests/output/cmds-unsafe-zone-mgs-stdout‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ done: <REDACTED_TIMESTAMP>
420420
errors: 0
421421

422422
Sled serial0
423-
part number: model0
423+
part number: 913-0000019
424424
power: A2
425425
revision: 0
426426
MGS slot: Sled 0
@@ -445,7 +445,7 @@ Sled serial0
445445
RoT: slot B SHA3-256: slotBdigest1
446446

447447
Sled serial1
448-
part number: model1
448+
part number: 913-0000019
449449
power: A2
450450
revision: 0
451451
MGS slot: Sled 1
@@ -470,7 +470,7 @@ Sled serial1
470470
RoT: slot B SHA3-256: slotBdigest1
471471

472472
Sled serial2
473-
part number: model2
473+
part number: 913-0000019
474474
power: A2
475475
revision: 0
476476
MGS slot: Sled 2

‎dev-tools/releng/src/main.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ const HOST_IMAGE_PACKAGES: [(&PackageName, InstallMethod); 8] = [
6868
(&PackageName::new_const("oxlog"), InstallMethod::Install),
6969
(&PackageName::new_const("propolis-server"), InstallMethod::Bundle),
7070
(&PackageName::new_const("pumpkind-gz"), InstallMethod::Install),
71-
(&PackageName::new_const("crucible-dtrace"), InstallMethod::Install),
71+
(&PackageName::new_const("crucible-utils"), InstallMethod::Install),
7272
(&PackageName::new_const("switch-asic"), InstallMethod::Bundle),
7373
];
7474
/// Packages to install or bundle in the recovery (trampoline) OS image.

‎docs/reconfigurator-dev-guide.adoc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -616,6 +616,7 @@ note: using Nexus URL http://[fd00:1122:3344:101::6]:12221
616616
[May 27 18:36:20] Completed (14/14) Kick off MGS-managed updates: after 7.28µs
617617
```
618618

619+
[#task-changing-live-systems]
619620
=== Task: making custom changes to live systems
620621

621622
Separating planning from execution makes it possible to create your own blueprints (different from what the system would create for itself) and have the system execute those. This is intended for development, testing, and product support (for emergencies). It's a multi-step process:

0 commit comments

Comments
 (0)