Skip to content

[sled-agent] Remove non self-assembling zone code#6162

Merged
karencfv merged 3 commits into
oxidecomputer:mainfrom
karencfv:self-assembling-cleanup
Jul 28, 2024
Merged

[sled-agent] Remove non self-assembling zone code#6162
karencfv merged 3 commits into
oxidecomputer:mainfrom
karencfv:self-assembling-cleanup

Conversation

@karencfv

Copy link
Copy Markdown
Contributor

This commit removes all code that is no longer necessary now that the self assembling zone work is finished.

Additionally, the smf_helper module has been moved to illumos_utils where all the Illumos helper code lives.

Closes: #1898

@karencfv karencfv requested a review from smklein July 26, 2024 01:52
Comment thread sled-agent/src/params.rs
Comment on lines -336 to -344
impl crate::smf_helper::Service for OmicronZoneType {
fn service_name(&self) -> String {
self.kind().service_prefix().to_owned()
}
fn smf_name(&self) -> String {
format!("svc:/oxide/{}", self.service_name())
}
}

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Removing this altogether as Omicron zones should not be meddling with smf properties. Only the switch zone still has to unfortunately.

Comment on lines -1510 to -1513
// TODO(https://github.com/oxidecomputer/omicron/issues/1898):
//
// These zones are self-assembling -- after they boot, there should
// be no "zlogin" necessary to initialize.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

🎉

@karencfv karencfv merged commit 013df0a into oxidecomputer:main Jul 28, 2024
@karencfv karencfv deleted the self-assembling-cleanup branch July 28, 2024 21:59
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.

Tracking issue for "Self-assembling Zones"

2 participants