Skip to content

Commit aba8f4d

Browse files
smkleinsmklein
committed
Add nexus_generation to blueprint
1 parent a9d9f1e commit aba8f4d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+2004
-326
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ async fn cmd_reconfigurator_export(
148148
// See Nexus::blueprint_planning_context().
149149
eprint!("assembling reconfigurator state ... ");
150150
let state = nexus_reconfigurator_preparation::reconfigurator_state_load(
151-
opctx, datastore,
151+
opctx, datastore, None,
152152
)
153153
.await?;
154154
eprintln!("done");

‎dev-tools/omdb/tests/successes.out

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1569,6 +1569,7 @@ parent: <none>
15691569
internal DNS version::: 1
15701570
external DNS version::: 2
15711571
target release min gen: 1
1572+
nexus gen:::::::::::::: 1
15721573

15731574
PENDING MGS-MANAGED UPDATES: 0
15741575

@@ -1692,6 +1693,7 @@ parent: <none>
16921693
internal DNS version::: 1
16931694
external DNS version::: 2
16941695
target release min gen: 1
1696+
nexus gen:::::::::::::: 1
16951697

16961698
PENDING MGS-MANAGED UPDATES: 0
16971699

‎dev-tools/reconfigurator-cli/tests/output/cmds-add-sled-no-disks-stdout

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,7 @@ parent: dbcbd3d6-41ff-48ae-ac0b-1becc9b2fd21
274274
internal DNS version::: 1
275275
external DNS version::: 1
276276
target release min gen: 1
277+
nexus gen:::::::::::::: 1
277278

278279
PENDING MGS-MANAGED UPDATES: 0
279280

‎dev-tools/reconfigurator-cli/tests/output/cmds-example-stdout

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,7 @@ parent: 02697f74-b14a-4418-90f0-c28b2a3a6aa9
399399
internal DNS version::: 1
400400
external DNS version::: 1
401401
target release min gen: 1
402+
nexus gen:::::::::::::: 1
402403

403404
PENDING MGS-MANAGED UPDATES: 0
404405

@@ -518,6 +519,7 @@ parent: 02697f74-b14a-4418-90f0-c28b2a3a6aa9
518519
internal DNS version::: 1
519520
external DNS version::: 1
520521
target release min gen: 1
522+
nexus gen:::::::::::::: 1
521523

522524
PENDING MGS-MANAGED UPDATES: 0
523525

@@ -1032,6 +1034,7 @@ parent: 02697f74-b14a-4418-90f0-c28b2a3a6aa9
10321034
internal DNS version::: 1
10331035
external DNS version::: 1
10341036
target release min gen: 1
1037+
nexus gen:::::::::::::: 1
10351038

10361039
PENDING MGS-MANAGED UPDATES: 0
10371040

‎dev-tools/reconfigurator-cli/tests/output/cmds-expunge-newly-added-external-dns-stdout

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,7 @@ parent: 06c88262-f435-410e-ba98-101bed41ec27
331331
internal DNS version::: 1
332332
external DNS version::: 1
333333
target release min gen: 1
334+
nexus gen:::::::::::::: 1
334335

335336
PENDING MGS-MANAGED UPDATES: 0
336337

@@ -1022,6 +1023,7 @@ parent: 3f00b694-1b16-4aaa-8f78-e6b3a527b434
10221023
internal DNS version::: 1
10231024
external DNS version::: 1
10241025
target release min gen: 1
1026+
nexus gen:::::::::::::: 1
10251027

10261028
PENDING MGS-MANAGED UPDATES: 0
10271029

@@ -1039,7 +1041,7 @@ chicken switches:
10391041
add zones with mupdate override: false
10401042

10411043
* discretionary zones placed:
1042-
* 1 zone on sled 711ac7f8-d19e-4572-bdb9-e9b50f6e362a: external_dns
1044+
* external_dns zone on sled 711ac7f8-d19e-4572-bdb9-e9b50f6e362a from source install dataset
10431045
* zone updates waiting on discretionary zones
10441046

10451047

@@ -1725,6 +1727,7 @@ parent: 366b0b68-d80e-4bc1-abd3-dc69837847e0
17251727
internal DNS version::: 1
17261728
external DNS version::: 1
17271729
target release min gen: 1
1730+
nexus gen:::::::::::::: 1
17281731

17291732
PENDING MGS-MANAGED UPDATES: 0
17301733

@@ -1733,7 +1736,7 @@ chicken switches:
17331736
add zones with mupdate override: false
17341737

17351738
* discretionary zones placed:
1736-
* 1 zone on sled 711ac7f8-d19e-4572-bdb9-e9b50f6e362a: external_dns
1739+
* external_dns zone on sled 711ac7f8-d19e-4572-bdb9-e9b50f6e362a from source install dataset
17371740
* zone updates waiting on discretionary zones
17381741

17391742

‎dev-tools/reconfigurator-cli/tests/output/cmds-expunge-newly-added-internal-dns-stdout

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,7 @@ parent: 184f10b3-61cb-41ef-9b93-3489b2bac559
329329
internal DNS version::: 1
330330
external DNS version::: 1
331331
target release min gen: 1
332+
nexus gen:::::::::::::: 1
332333

333334
PENDING MGS-MANAGED UPDATES: 0
334335

@@ -1053,7 +1054,7 @@ chicken switches:
10531054
add zones with mupdate override: false
10541055

10551056
* discretionary zones placed:
1056-
* 1 zone on sled 2b8f0cb3-0295-4b3c-bc58-4fe88b57112c: internal_dns
1057+
* internal_dns zone on sled 2b8f0cb3-0295-4b3c-bc58-4fe88b57112c from source install dataset
10571058
* zone updates waiting on discretionary zones
10581059

10591060

‎dev-tools/reconfigurator-cli/tests/output/cmds-host-phase-2-source-stdout

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -709,6 +709,7 @@ parent: 8da82a8e-bf97-4fbd-8ddd-9f6462732cf1
709709
internal DNS version::: 1
710710
external DNS version::: 1
711711
target release min gen: 1
712+
nexus gen:::::::::::::: 1
712713

713714
PENDING MGS-MANAGED UPDATES: 0
714715

@@ -1419,6 +1420,7 @@ parent: af934083-59b5-4bf6-8966-6fb5292c29e1
14191420
internal DNS version::: 1
14201421
external DNS version::: 1
14211422
target release min gen: 1
1423+
nexus gen:::::::::::::: 1
14221424

14231425
PENDING MGS-MANAGED UPDATES: 0
14241426

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1554,6 +1554,7 @@ parent: c1a0d242-9160-40f4-96ae-61f8f40a0b1b
15541554
internal DNS version::: 1
15551555
external DNS version::: 1
15561556
target release min gen: 4
1557+
nexus gen:::::::::::::: 1
15571558

15581559
PENDING MGS-MANAGED UPDATES: 0
15591560

@@ -1968,6 +1969,7 @@ parent: afb09faf-a586-4483-9289-04d4f1d8ba23
19681969
internal DNS version::: 1
19691970
external DNS version::: 1
19701971
target release min gen: 4
1972+
nexus gen:::::::::::::: 1
19711973

19721974
PENDING MGS-MANAGED UPDATES: 0
19731975

@@ -2203,6 +2205,7 @@ chicken switches:
22032205

22042206
* skipping noop image source check on sled 98e6b7c2-2efa-41ca-b20a-0a4d61102fe6: all 6 zones are already from artifacts
22052207
* skipping noop image source check on sled d81c6a84-79b8-4958-ae41-ea46c9b19763: all 6 zones are already from artifacts
2208+
* only placed 0/2 desired nexus zones
22062209

22072210

22082211
> blueprint-show latest
@@ -2367,6 +2370,7 @@ parent: ce365dff-2cdb-4f35-a186-b15e20e1e700
23672370
internal DNS version::: 1
23682371
external DNS version::: 1
23692372
target release min gen: 4
2373+
nexus gen:::::::::::::: 1
23702374

23712375
PENDING MGS-MANAGED UPDATES: 0
23722376

@@ -2376,6 +2380,7 @@ chicken switches:
23762380

23772381
* skipping noop image source check on sled 98e6b7c2-2efa-41ca-b20a-0a4d61102fe6: all 6 zones are already from artifacts
23782382
* skipping noop image source check on sled d81c6a84-79b8-4958-ae41-ea46c9b19763: all 6 zones are already from artifacts
2383+
* only placed 0/2 desired nexus zones
23792384

23802385

23812386

@@ -2785,6 +2790,7 @@ planning report for blueprint 61a93ea3-c872-48e0-aace-e86b0c52b839:
27852790
* adding zones despite MUPdate override, as specified by the `add_zones_with_mupdate_override` chicken switch
27862791
* discretionary zone placement waiting for NTP zones on sleds: c3bc4c6d-fdde-4fc4-8493-89d2a1e5ee6b
27872792
* missing NTP zone on sled c3bc4c6d-fdde-4fc4-8493-89d2a1e5ee6b
2793+
* only placed 0/2 desired nexus zones
27882794
* zone updates waiting on MUPdate overrides
27892795

27902796

‎dev-tools/reconfigurator-cli/tests/output/cmds-set-mgs-updates-stdout

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@ parent: 6ccc786b-17f1-4562-958f-5a7d9a5a15fd
205205
internal DNS version::: 1
206206
external DNS version::: 1
207207
target release min gen: 1
208+
nexus gen:::::::::::::: 1
208209

209210
PENDING MGS-MANAGED UPDATES: 0
210211

@@ -416,6 +417,7 @@ parent: ad97e762-7bf1-45a6-a98f-60afb7e491c0
416417
internal DNS version::: 1
417418
external DNS version::: 1
418419
target release min gen: 1
420+
nexus gen:::::::::::::: 1
419421

420422
PENDING MGS-MANAGED UPDATES: 1
421423
Pending MGS-managed updates (all baseboards):
@@ -963,6 +965,7 @@ parent: cca24b71-09b5-4042-9185-b33e9f2ebba0
963965
internal DNS version::: 1
964966
external DNS version::: 1
965967
target release min gen: 1
968+
nexus gen:::::::::::::: 1
966969

967970
PENDING MGS-MANAGED UPDATES: 1
968971
Pending MGS-managed updates (all baseboards):
@@ -1513,6 +1516,7 @@ parent: 5bf974f3-81f9-455b-b24e-3099f765664c
15131516
internal DNS version::: 1
15141517
external DNS version::: 1
15151518
target release min gen: 1
1519+
nexus gen:::::::::::::: 1
15161520

15171521
PENDING MGS-MANAGED UPDATES: 2
15181522
Pending MGS-managed updates (all baseboards):
@@ -1895,6 +1899,7 @@ parent: 1b837a27-3be1-4fcb-8499-a921c839e1d0
18951899
internal DNS version::: 1
18961900
external DNS version::: 1
18971901
target release min gen: 1
1902+
nexus gen:::::::::::::: 1
18981903

18991904
PENDING MGS-MANAGED UPDATES: 1
19001905
Pending MGS-managed updates (all baseboards):

‎dev-tools/reconfigurator-cli/tests/output/cmds-set-remove-mupdate-override-stdout

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,7 @@ parent: df06bb57-ad42-4431-9206-abff322896c7
274274
internal DNS version::: 1
275275
external DNS version::: 1
276276
target release min gen: 1
277+
nexus gen:::::::::::::: 1
277278

278279
PENDING MGS-MANAGED UPDATES: 0
279280

@@ -665,6 +666,7 @@ parent: afb09faf-a586-4483-9289-04d4f1d8ba23
665666
internal DNS version::: 1
666667
external DNS version::: 1
667668
target release min gen: 2
669+
nexus gen:::::::::::::: 1
668670

669671
PENDING MGS-MANAGED UPDATES: 0
670672

0 commit comments

Comments
 (0)