Skip to content

Commit 9a946c0

Browse files
authored
Make wicketd + installinator cosmo aware (#9038)
This is the minimum set of changes to be able to update the next generation sled Cosmo. The most intrusive change is choosing a separate host phase 1 artifact. This change does not attempt to differentiate between a Gimlet and a Cosmo at the inventory level which will need to happen separately. This change also does not support updating cosmos via reconfigurator driven update.
1 parent 0db16bd commit 9a946c0

File tree

21 files changed

+526
-201
lines changed

21 files changed

+526
-201
lines changed

Cargo.lock

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

dev-tools/reconfigurator-cli/tests/input/cmds-mupdate-update-flow.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -141,22 +141,22 @@ sled-update-rot-bootloader serial0 --stage0 2.0.0
141141
# Finish the MGS-based updates on sled 0.
142142
sled-update-rot serial0 --slot-a 2.0.0
143143
sled-update-sp serial0 --active 2.0.0
144-
sled-update-host-phase2 serial0 --boot-disk B --slot-b 0c0362b640cece5b9a5e86d8fa683bd2eb84c3e7f90731f597197d604ffa76e3
145-
sled-update-host-phase1 serial0 --active B --slot-b 44714733af7600b30a50bfd2cbaf707ff7ee9724073ff70a6732e55a88864cf6
144+
sled-update-host-phase2 serial0 --boot-disk B --slot-b 9ff631b5b7229604ab7c5aae2ee4a34a64772736b332540d38077b3aea6952df
145+
sled-update-host-phase1 serial0 --active B --slot-b 1eba0d79ea9d34558fb3f923a06614bd740649eeb0ca6e5086529dc60cd6f729
146146

147147
# All the MGS-based updates on sled 1.
148148
sled-update-rot-bootloader serial1 --stage0 2.0.0
149149
sled-update-rot serial1 --slot-a 2.0.0
150150
sled-update-sp serial1 --active 2.0.0
151-
sled-update-host-phase2 serial1 --boot-disk B --slot-b 0c0362b640cece5b9a5e86d8fa683bd2eb84c3e7f90731f597197d604ffa76e3
152-
sled-update-host-phase1 serial1 --active B --slot-b 44714733af7600b30a50bfd2cbaf707ff7ee9724073ff70a6732e55a88864cf6
151+
sled-update-host-phase2 serial1 --boot-disk B --slot-b 9ff631b5b7229604ab7c5aae2ee4a34a64772736b332540d38077b3aea6952df
152+
sled-update-host-phase1 serial1 --active B --slot-b 1eba0d79ea9d34558fb3f923a06614bd740649eeb0ca6e5086529dc60cd6f729
153153

154154
# All the MGS-based updates on sled 2.
155155
sled-update-rot-bootloader serial2 --stage0 2.0.0
156156
sled-update-rot serial2 --slot-a 2.0.0
157157
sled-update-sp serial2 --active 2.0.0
158-
sled-update-host-phase2 serial2 --boot-disk B --slot-b 0c0362b640cece5b9a5e86d8fa683bd2eb84c3e7f90731f597197d604ffa76e3
159-
sled-update-host-phase1 serial2 --active B --slot-b 44714733af7600b30a50bfd2cbaf707ff7ee9724073ff70a6732e55a88864cf6
158+
sled-update-host-phase2 serial2 --boot-disk B --slot-b 9ff631b5b7229604ab7c5aae2ee4a34a64772736b332540d38077b3aea6952df
159+
sled-update-host-phase1 serial2 --active B --slot-b 1eba0d79ea9d34558fb3f923a06614bd740649eeb0ca6e5086529dc60cd6f729
160160

161161
# All MGS-based updates complete.
162162
inventory-generate

dev-tools/reconfigurator-cli/tests/input/cmds-target-release.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ blueprint-diff latest
7373

7474
# Update only the simulated host phase 2; this is a prerequisite for updating
7575
# the phase 1, and must be done first.
76-
sled-update-host-phase2 98e6b7c2-2efa-41ca-b20a-0a4d61102fe6 --slot-b f3dd0c7a1bd4500ea0d8bcf67581f576d47752b2f1998a4cb0f0c3155c483008
76+
sled-update-host-phase2 98e6b7c2-2efa-41ca-b20a-0a4d61102fe6 --slot-b d944ae205b61ccf4322448f7d0311a819c53d9844769de066c5307c1682abb47
7777
inventory-generate
7878

7979
# Planning after only phase 2 has changed should make no changes. We're still
@@ -82,7 +82,7 @@ blueprint-plan latest latest
8282
blueprint-diff latest
8383

8484
# Now update the simulated SP to reflect that the phase 1 update is done.
85-
sled-update-host-phase1 98e6b7c2-2efa-41ca-b20a-0a4d61102fe6 --active B --slot-b 2053f8594971bbf0a7326c833e2ffc12b065b9d823b9c0b967d275fa595e4e89
85+
sled-update-host-phase1 98e6b7c2-2efa-41ca-b20a-0a4d61102fe6 --active B --slot-b b99d5273ba1418bebb19d74b701d716896409566d41de76ada71bded4c9b166b
8686
inventory-generate
8787

8888
# Planning _still_ shouldn't make any new changes; the OS update as a whole
@@ -159,8 +159,8 @@ blueprint-plan latest latest
159159
blueprint-diff latest
160160

161161
# Now simulate the update completing successfully.
162-
sled-update-host-phase2 2b8f0cb3-0295-4b3c-bc58-4fe88b57112c --boot-disk B --slot-b f3dd0c7a1bd4500ea0d8bcf67581f576d47752b2f1998a4cb0f0c3155c483008
163-
sled-update-host-phase1 2b8f0cb3-0295-4b3c-bc58-4fe88b57112c --active B --slot-b 2053f8594971bbf0a7326c833e2ffc12b065b9d823b9c0b967d275fa595e4e89
162+
sled-update-host-phase2 2b8f0cb3-0295-4b3c-bc58-4fe88b57112c --boot-disk B --slot-b d944ae205b61ccf4322448f7d0311a819c53d9844769de066c5307c1682abb47
163+
sled-update-host-phase1 2b8f0cb3-0295-4b3c-bc58-4fe88b57112c --active B --slot-b b99d5273ba1418bebb19d74b701d716896409566d41de76ada71bded4c9b166b
164164
inventory-generate
165165

166166
# Another planning step should try to update the last sled, starting with the
@@ -219,8 +219,8 @@ blueprint-plan latest latest
219219
blueprint-diff latest
220220

221221
# Finish updating the last sled's host OS.
222-
sled-update-host-phase2 d81c6a84-79b8-4958-ae41-ea46c9b19763 --boot-disk B --slot-b f3dd0c7a1bd4500ea0d8bcf67581f576d47752b2f1998a4cb0f0c3155c483008
223-
sled-update-host-phase1 d81c6a84-79b8-4958-ae41-ea46c9b19763 --active B --slot-b 2053f8594971bbf0a7326c833e2ffc12b065b9d823b9c0b967d275fa595e4e89
222+
sled-update-host-phase2 d81c6a84-79b8-4958-ae41-ea46c9b19763 --boot-disk B --slot-b d944ae205b61ccf4322448f7d0311a819c53d9844769de066c5307c1682abb47
223+
sled-update-host-phase1 d81c6a84-79b8-4958-ae41-ea46c9b19763 --active B --slot-b b99d5273ba1418bebb19d74b701d716896409566d41de76ada71bded4c9b166b
224224
inventory-generate
225225

226226
# Do another planning run. This should start updating zones (one at a time).

0 commit comments

Comments
 (0)