Update thing-flinger to track changes to omicron #1001
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1. Include specific files/directories under `out/` (prebuilt dependencies) 2. Exclude `config-rss.toml` (needs to be moved to `thing-flinger overlay`)
andrewjstone
approved these changes
May 2, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR is the output of attempting to follow the instructions in deploy/README.adoc to use thing-flinger to set up a 2-sled omicron deployment on helios VMs on my Linux workstation. The changes are limited to
deploy/with two exceptions:omicron-package(in the spirit of [sled agent] Overhaul error handling to be more informative #967)install_prerequisites.shto make it more friendly in a scripted context (-yto skip confirm prompts and-pto skip the check of$PATHat the end)Even with these changes, deploying multisled via thing-flinger isn't completely working, for at least two reasons:
create_virtual_hardware.shon each of the deployment target VMs. This might be worth adding to thing-flinger if testing on multiple VMs becomes more common?smf/that thing-flinger broadcasts to all sled-agents. The most immediate one is that RSS is responsible for distributing IP addresses assigned to service-specific zones, but the configuration of the service itself (including what IP address to bind to) is separate.An example of the second point for nexus:
https://github.com/oxidecomputer/omicron/blob/main/smf/sled-agent/config-rss.toml#L43-L48 lists addresses RSS hands out for a nexus instance
https://github.com/oxidecomputer/omicron/blob/main/smf/nexus/config.toml#L23-L29 are the same addresses repeated in the nexus config
If one adds a second nexus service to RSS's config with a different pair of addresses, there's not currently a way to (automatically) distribute a tweaked nexus
config.tomlcontaining those different addresses. @smklein and I chatted briefly about this, and I think it's covered under #822 - if RSS is responsible for handing out addresses, they ultimately shouldn't be hardcoded into nexus's config at all.