Azure hybrid image handling #591
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
Thank you for contributing to the Leapp project!Please note that every PR needs to comply with the If you want to re-run tests or request review, you can use following commands as a comment:
Note: In case there are problems with tests hanging or pending for a long time, please consider rerunning the CI by commenting leapp-ci build. |
|
leapp-ci build |
pirat89
requested changes
Sep 24, 2020
repos/system_upgrade/el7toel8/actors/cloud/checkhybridimage/actor.py
Outdated
Show resolved
Hide resolved
repos/system_upgrade/el7toel8/actors/cloud/checkhybridimage/libraries/checkhybridimage.py
Outdated
Show resolved
Hide resolved
repos/system_upgrade/el7toel8/actors/cloud/checkhybridimage/libraries/checkhybridimage.py
Outdated
Show resolved
Hide resolved
repos/system_upgrade/el7toel8/actors/cloud/checkhybridimage/tests/test_checkhybridimage.py
Outdated
Show resolved
Hide resolved
repos/system_upgrade/el7toel8/actors/cloud/grubenvtofile/actor.py
Outdated
Show resolved
Hide resolved
repos/system_upgrade/el7toel8/actors/cloud/grubenvtofile/libraries/grubenvtofile.py
Outdated
Show resolved
Hide resolved
repos/system_upgrade/el7toel8/actors/cloud/grubenvtofile/actor.py
Outdated
Show resolved
Hide resolved
Rezney
force-pushed
the
azure_fixes
branch
2 times, most recently
from
8b78e4c
to
ddef350
Compare
pirat89
reviewed
Sep 29, 2020
Comment on lines
+23
to
+27
| grubenv_msg = next(self.consume(HybridImage), None) | ||
|
|
||
| if grubenv_msg and grubenv_msg.detected: |
There was a problem hiding this comment.
What about this (↓)? Anyway, not blocker. I am ok with the current solution as well.
Suggested change
| grubenv_msg = next(self.consume(HybridImage), None) | |
| if grubenv_msg and grubenv_msg.detected: | |
| grubenv_msg = next(self.consume(HybridImage), HybridImage()) | |
| if grubenv_msg.detected: |
Detect Azure hybrid (BIOS/EFI) image and convert /boot/grub2/grubenv symling pointing to /boot/efi/EFI/redhat/grubenv to a normal file as GRUB cannot read the symlink if it is pointing to different partition (in case of BIOS). Consequently, we do not need the "KernelCmdlineArg" with "root_delay" anymore.
pirat89
approved these changes
Sep 29, 2020
|
Hi, tested using the playbook on all 4 variations (gen1/gen2 x rhui/byos) and it upgrades OK. |
MichalHe
pushed a commit
to MichalHe/leapp-repository
that referenced
this pull request
Jun 21, 2022
## Packaging - Add BuildRequires on python2-setuptools - Add new dependency on python2-requests - Add unversioned dependency on leapp-repository and provide the leapp-framework capability in python2-leapp (see docs about "new dependency mechanism") (oamg#591) - Move all leapp and snactor files into related rpms instead of python?-leapp (oamg#591) - Remove dependency on Jinja2 ## Framework ### Fixes - Fix json export capabilities using serialization (oamg#598) ### Enhancements - Add the DESKTOP tag for the leapp report (oamg#612) - Dialogs are non-interactive and redesigned significantly; but in beta support (see the known issue) - Introduce DialogModel that could be processed by actors to add related information into the report (oamg#589) - Introduce Workflow API (see the Workflow APIs tutorial) (oamg#618) - Report inhibitors separately from errors on stdout (oamg#620) - Show progress in non-verbose executions (oamg#621) ### Known issue - The answerfile is not generated on some machines after the run of leapp. Currently it's under investigation. ## Leapp ### Fixes - Print message about generated report when `leapp upgrade` ends, as we do for `leapp preupgrade` (oamg#573) ### Enhancements - Add `leapp answer` to answer Dialog questions in CLI (oamg#592) - Add the --no-rhsm option for (pre)upgrade commands (oamg#622) - Add the --enablerepo option for Leapp to use an existing custom yum/dnf repository during the upgrade - Display a warning when leapp is used in an unsupported (devel/testing) mode (oamg#577) - Print errors on stdout in pretty format (oamg#593) - Error messages are now part of the preupgrade report - The verbosity options (--verbose | --debug) are available for leapp commands as well ## stdlib ### Enhancements - Add `stdin` and `encoding` parameters in the run function (oamg#583, oamg#595) ## Modifications - Code is compatible with Python3 pylint
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.
Detect Azure hybrid (BIOS/EFI) image and convert
/boot/grub2/grubenv symlink pointing to
/boot/efi/EFI/redhat/grubenv to a normal file
as GRUB cannot read the symlink if it is pointing
to different partition (in case of BIOS).
Consequently, we do not need the "KernelCmdlineArg"
with "root_delay" anymore.