Skip to content

Commit

Permalink
C2R: Remove env vars/opts with no effect
Browse files Browse the repository at this point in the history
- The --no-rpm-va option has no effect with `convert2rhel analysis` anymore
  (rpm -Va runs always and a warning is printed when the option is used saying
  that it has no effect)
-- Related: oamg/convert2rhel#875
- The CONVERT2RHEL_DISABLE_TELEMETRY env var was removed
-- Related: oamg/convert2rhel#1102
- The CONVERT2RHEL_UNSUPPORTED_INCOMPLETE_ROLLBACK was removed in favor
  of CONVERT2RHEL_INCOMPLETE_ROLLBACK
-- Related: oamg/convert2rhel#1147
- The CONVERT2RHEL_LATEST_VERSION env var has never been a valid env var
  recognized by convert2rhel. It is an ID of one of convert2rhel
  Actions. A similar env var to this is CONVERT2RHEL_UNSUPPORTED_VERSION
  which is in recent versions (2.x) removed in favor of
  CONVERT2RHEL_ALLOW_OLDER_VERSION.

Also, the convert_reboot_requested should not be needed when it comes to
just analyzing the system (convert2rhel analyze). The --restart convert2rhel
option is heeded just when it comes to the actual conversion.

And, when the workshop executes and older convert2rhel version (on
purpose) then the pre-conversion analysis ends up with two inhibitors:
- Outdated convert2rhel version detected
- Outdated packages detected
This commit adds the related environment variables to override the
inhibitors.
  • Loading branch information
bocekm committed Feb 7, 2025
1 parent 3ef2796 commit fc3209a
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
9 changes: 6 additions & 3 deletions c2r_analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,12 @@
gather_facts: true
become: true
environment:
CONVERT2RHEL_DISABLE_TELEMETRY: 1
# CONVERT2RHEL_ALLOW_OLDER_VERSION: 1
# CONVERT2RHEL_UNSUPPORTED_INCOMPLETE_ROLLBACK: 1
# The CONVERT2RHEL_OUTDATED_PACKAGE_CHECK_SKIP and CONVERT2RHEL_ALLOW_OLDER_VERSION
# variables are needed when an older version of convert2rhel is used. The
# package-up-to-date and convert2rhel-latest-version checks inhibit the
# conversion if not passing but can be overriden.
CONVERT2RHEL_OUTDATED_PACKAGE_CHECK_SKIP: 1
CONVERT2RHEL_ALLOW_OLDER_VERSION: 1
vars:
rhsm_username: ""
rhsm_password: ""
Expand Down
3 changes: 0 additions & 3 deletions c2r_convert.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@
gather_facts: true
become: true
environment:
CONVERT2RHEL_DISABLE_TELEMETRY: 1
# CONVERT2RHEL_UNSUPPORTED_INCOMPLETE_ROLLBACK: 1
CONVERT2RHEL_INCOMPLETE_ROLLBACK: 1
CONVERT2RHEL_LATEST_VERSION: 0
vars:
rhsm_username: ""
rhsm_password: ""
Expand Down
3 changes: 1 addition & 2 deletions group_vars/control/worflow_job_templates.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ controller_workflows:
description: Workflow for Snapshot and Pre-conversion analysis of EL systems
extra_vars:
org_id: "Default_Organization"
convert_convert2rhel_opts: '--no-rpm-va'
convert_reboot_requested: true
convert_convert2rhel_opts: ''
lvm_snapshots_action: create
inventory: EC2 Dynamic Inventory
state: present
Expand Down

0 comments on commit fc3209a

Please sign in to comment.