Skip to content
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

Allow for specifying the autoinstall file over the kernel command line #1803

Merged

Conversation

Chris-Peterson444
Copy link
Contributor

This change allows for specifying the location of the autoinstall.yaml file in the kernel command line via subiquity.autoinstallpath. So, something like subiquity.autoinstallpath=path/to/autoinstall.yaml.

I have additionally changed the precedence for the various ways the autoinstall file may be passed from:

1. root of the drive
2. subiquity cmdline
3. cloud config
4. root of cdrom

To:

1. subiquity cmdline
2. kernel cmdline
3. root of the drive
4. cloud config
5. root of the cdrom

For the tests:

  1. I've added a test for the kernel command line case.
  2. Reordered them to align with precedence changes
  3. Used explicit "missing" values where possible (e.g., None for the subiquity arg when the case is no arg is passed), instead of simply leaving them undefined.

Copy link
Collaborator

@dbungert dbungert left a comment

Choose a reason for hiding this comment

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

Doc update please, and please rebase the commits down to one or two. Doc update could arguably be a distinct commit. We don't use the squash merge feature so the commits should be long-term interesting.

Take a peek at recent commit history for the convention being used, for instance "initial fix" is more generic than I would like.

Thanks!

subiquity/server/server.py Show resolved Hide resolved
@Chris-Peterson444
Copy link
Contributor Author

Docs updated and commits rebased. Let me know if you would like the section in the doc to be elaborated further.

Copy link
Collaborator

@dbungert dbungert left a comment

Choose a reason for hiding this comment

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

Thanks. One doc tweak and this is done.

doc/intro-to-autoinstall.rst Outdated Show resolved Hide resolved
@Chris-Peterson444 Chris-Peterson444 merged commit 4010f0a into canonical:main Sep 21, 2023
12 checks passed
@Chris-Peterson444 Chris-Peterson444 deleted the kernel-autoinstall-file branch September 21, 2023 20:45
# 2. command line argument autoinstall
# 3. autoinstall supplied by cloud config
# 4. autoinstall baked into the iso, found at /cdrom/autoinstall.yaml
# 1. command line argument autoinstall
Copy link
Member

Choose a reason for hiding this comment

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

Thanks for move CLI argument up the chain. It feels more natural.

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