From e5866662172773a6b353b57f93d0c5b298f1ffd2 Mon Sep 17 00:00:00 2001 From: bontreger Date: Thu, 17 Oct 2024 09:07:54 -0400 Subject: [PATCH] Updating the examples from 8.8 to 8.10 (#230) * Updated versions in example playbooks and docs to 8.10 * 8.10 typo * Add changelog fragment. --------- Co-authored-by: bontreger Co-authored-by: Jeffrey Cutter --- changelogs/fragments/update_8_8_to_8_10.yml | 3 +++ playbooks/analysis.yml | 2 +- playbooks/upgrade.yml | 2 +- roles/analysis/defaults/main.yml | 8 ++++---- roles/upgrade/defaults/main.yml | 8 ++++---- 5 files changed, 13 insertions(+), 10 deletions(-) create mode 100644 changelogs/fragments/update_8_8_to_8_10.yml diff --git a/changelogs/fragments/update_8_8_to_8_10.yml b/changelogs/fragments/update_8_8_to_8_10.yml new file mode 100644 index 0000000..fca47d4 --- /dev/null +++ b/changelogs/fragments/update_8_8_to_8_10.yml @@ -0,0 +1,3 @@ +--- +minor_changes: +- Update example playbooks and variables from 8.8 to 8.10. diff --git a/playbooks/analysis.yml b/playbooks/analysis.yml index 11419a0..9f1bcf5 100644 --- a/playbooks/analysis.yml +++ b/playbooks/analysis.yml @@ -14,7 +14,7 @@ # analysis_repos_el7: rhel-7-server-extras-rpms # Optionally override the default analysis_repos_el7 to use the upstream copr leapp repository: # analysis_repos_el7: copr:copr.fedorainfracloud.org:group_oamg:leapp - leapp_preupg_opts: --target 8.8 + leapp_preupg_opts: --target 8.10 leapp_answerfile: | [remove_pam_pkcs11_module_check] confirm = True diff --git a/playbooks/upgrade.yml b/playbooks/upgrade.yml index 2a8ecea..558f670 100644 --- a/playbooks/upgrade.yml +++ b/playbooks/upgrade.yml @@ -8,7 +8,7 @@ satellite_organization: My Satellite Organization satellite_activation_key_leapp: MY_ACTIVATION_KEY satellite_activation_key_post_leapp: MY_ACTIVATION_KEY_POST - leapp_upgrade_opts: --target 8.8 + leapp_upgrade_opts: --target 8.10 update_grub_to_grub_2: true selinux_mode: permissive tasks: diff --git a/roles/analysis/defaults/main.yml b/roles/analysis/defaults/main.yml index 4a6c255..759bc5c 100644 --- a/roles/analysis/defaults/main.yml +++ b/roles/analysis/defaults/main.yml @@ -88,15 +88,15 @@ local_repos_pre_leapp: [] local_repos_leapp: [] # local_repos_leapp: # - name: rhel-8-for-x86_64-baseos-rpms -# description: Red Hat 8.8 Base OS -# baseurl: http://repo01.example.com/8.8/rhel-8-for-x86_64-baseos-rpms +# description: Red Hat 8.10 Base OS +# baseurl: http://repo01.example.com/8.10/rhel-8-for-x86_64-baseos-rpms # # enabled: 1 # Default 1 # # gpgcheck: 0 # Default 0 # # gpgkey: XXX # Default omit. # # repo_gpgcheck: 0 # Default omit. # - name: rhel-8-for-x86_64-appstream-rpms -# description: Red Hat 8.8 App Stream -# baseurl: http://repo01.example.com/8.8/rhel-8-for-x86_64-baseos-rpms +# description: Red Hat 8.10 App Stream +# baseurl: http://repo01.example.com/8.10/rhel-8-for-x86_64-baseos-rpms # # enabled: 1 # Default 1 # # gpgcheck: 0 # Default 0 # # gpgkey: XXX # Default omit. diff --git a/roles/upgrade/defaults/main.yml b/roles/upgrade/defaults/main.yml index 16dfe4a..a8169e7 100644 --- a/roles/upgrade/defaults/main.yml +++ b/roles/upgrade/defaults/main.yml @@ -47,8 +47,8 @@ local_repos_pre_leapp: [] local_repos_leapp: [] # local_repos_leapp: # - name: rhel-8-for-x86_64-baseos-rpms -# description: Red Hat 8.8 Base OS -# baseurl: http://repo03.example.com/8.8/rhel-8-for-x86_64-baseos-rpms +# description: Red Hat 8.10 Base OS +# baseurl: http://repo03.example.com/8.10/rhel-8-for-x86_64-baseos-rpms # # enabled: 1 # Default 1 # # gpgcheck: 0 # Default 0 # # gpgkey: XXX # Default omit. @@ -57,8 +57,8 @@ local_repos_leapp: [] # # file: local # Will be ignored for leapp_upgrade_repositories.repo # # state: present # Defaults to present. # - name: rhel-8-for-x86_64-appstream-rpms -# description: Red Hat 8.8 App Stream -# baseurl: http://repo03.example.com/8.8/rhel-8-for-x86_64-baseos-rpms +# description: Red Hat 8.10 App Stream +# baseurl: http://repo03.example.com/8.10/rhel-8-for-x86_64-baseos-rpms # # enabled: 1 # Default 1 # # gpgcheck: 0 # Default 0 # # gpgkey: XXX # Default omit.