Skip to content

Add desired host phase 2 contents to OmicronSledConfig (PR 1/4) #8538

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jul 9, 2025

Conversation

jgallagher
Copy link
Contributor

HostPhase2DesiredContents is analogous to OmicronZoneImageSource, but for OS images: either keep the current contents of the boot disk or set it to a specific artifact from the TUF repo depot. "Keep the current contents" should show up in three cases, just like OmicronZoneImageSource::InstallDataset:

  1. It's the default value for deserializing, so we can load old configs that didn't have this value
  2. RSS uses it (no TUF repo depot involved at this point)
  3. The planner will use this variant as a part of removing a mupdate override (this work is still in PR itself: [29/n] blueprint planner logic for mupdate overrides #8456 (comment))

};

// TODO-john also test host phase 2 artifacts!
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This and its friend below are both addressed in #8539

@@ -1944,6 +1946,9 @@ pub struct InvOmicronSledConfig {
pub id: DbTypedUuid<OmicronSledConfigKind>,
pub generation: Generation,
pub remove_mupdate_override: Option<DbTypedUuid<MupdateOverrideKind>>,

#[diesel(embed)]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TIL

Copy link
Contributor

@sunshowers sunshowers left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks!

@jgallagher jgallagher merged commit 77d097a into main Jul 9, 2025
18 checks passed
@jgallagher jgallagher deleted the john/sled-config-phase2 branch July 9, 2025 16:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants