From 8b9b2c6be68b3c17b980065ce273ff9b29d55917 Mon Sep 17 00:00:00 2001 From: "Jesse Pretorius (odyssey4me)" Date: Wed, 8 Dec 2021 14:37:43 +0000 Subject: [PATCH] [train-only] Remove advanced-virt repo references The advanced virt repository is no longer required to be present on the undercloud or overcloud. Libvirt is now fully containerised. Related-Bug: rhbz#2027787 Change-Id: Ia856ddf43896f288a4bc9900c4eacdf10185e989 --- environments/lifecycle/upgrade-prepare.yaml | 2 +- environments/rhsm.yaml | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/environments/lifecycle/upgrade-prepare.yaml b/environments/lifecycle/upgrade-prepare.yaml index bcce60b1ce..732a241b91 100644 --- a/environments/lifecycle/upgrade-prepare.yaml +++ b/environments/lifecycle/upgrade-prepare.yaml @@ -8,7 +8,7 @@ resource_registry: OS::TripleO::Services::MongoDb: OS::Heat::None parameter_defaults: - UpgradeLeappCommandOptions: " --enablerepo rhel-8-for-x86_64-baseos-eus-rpms --enablerepo rhel-8-for-x86_64-appstream-eus-rpms --enablerepo rhel-8-for-x86_64-highavailability-eus-rpms --enablerepo advanced-virt-for-rhel-8-x86_64-rpms --enablerepo ansible-2.9-for-rhel-8-x86_64-rpms --enablerepo fast-datapath-for-rhel-8-x86_64-rpms " + UpgradeLeappCommandOptions: " --enablerepo rhel-8-for-x86_64-baseos-eus-rpms --enablerepo rhel-8-for-x86_64-appstream-eus-rpms --enablerepo rhel-8-for-x86_64-highavailability-eus-rpms --enablerepo ansible-2.9-for-rhel-8-x86_64-rpms --enablerepo fast-datapath-for-rhel-8-x86_64-rpms " CephAnsiblePlaybook: default EnablePackageInstall: true UpgradeLevelNovaCompute: '' diff --git a/environments/rhsm.yaml b/environments/rhsm.yaml index b2d7222a20..1c2f9e969d 100644 --- a/environments/rhsm.yaml +++ b/environments/rhsm.yaml @@ -10,7 +10,6 @@ parameter_defaults: # - rhel-8-for-x86_64-appstream-eus-rpms # - rhel-8-for-x86_64-highavailability-eus-rpms # - ansible-2.9-for-rhel-8-x86_64-rpms -# - advanced-virt-for-rhel-8-x86_64-rpms # - openstack-16.1-for-rhel-8-x86_64-rpms # - fast-datapath-for-rhel-8-x86_64-rpms # - rhceph-4-tools-for-rhel-8-x86_64-rpms @@ -29,7 +28,6 @@ parameter_defaults: # - rhel-8-for-x86_64-appstream-eus-rpms # - rhel-8-for-x86_64-highavailability-eus-rpms # - ansible-2.9-for-rhel-8-x86_64-rpms -# - advanced-virt-for-rhel-8-x86_64-rpms # - openstack-16.1-for-rhel-8-x86_64-rpms # - fast-datapath-for-rhel-8-x86_64-rpms # - rhceph-4-tools-for-rhel-8-x86_64-rpms