openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "[train-only] Remove advanced-virt repo references" into stable/train

This commit is contained in:
Zuul 2021-12-09 11:25:38 +00:00 committed by Gerrit Code Review
parent 4b2881306f 8b9b2c6be6
commit f24ae3eae6
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
environments/lifecycle/upgrade-prepare.yaml
View File

@ -8,7 +8,7 @@ resource_registry:
OS::TripleO::Services::MongoDb: OS::Heat::None OS::TripleO::Services::MongoDb: OS::Heat::None
parameter_defaults: 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 CephAnsiblePlaybook: default
EnablePackageInstall: true EnablePackageInstall: true
UpgradeLevelNovaCompute: '' UpgradeLevelNovaCompute: ''

2
environments/rhsm.yaml
View File

@ -10,7 +10,6 @@ parameter_defaults:
# - rhel-8-for-x86_64-appstream-eus-rpms # - rhel-8-for-x86_64-appstream-eus-rpms
# - rhel-8-for-x86_64-highavailability-eus-rpms # - rhel-8-for-x86_64-highavailability-eus-rpms
# - ansible-2.9-for-rhel-8-x86_64-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 # - openstack-16.1-for-rhel-8-x86_64-rpms
# - fast-datapath-for-rhel-8-x86_64-rpms # - fast-datapath-for-rhel-8-x86_64-rpms
# - rhceph-4-tools-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-appstream-eus-rpms
# - rhel-8-for-x86_64-highavailability-eus-rpms # - rhel-8-for-x86_64-highavailability-eus-rpms
# - ansible-2.9-for-rhel-8-x86_64-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 # - openstack-16.1-for-rhel-8-x86_64-rpms
# - fast-datapath-for-rhel-8-x86_64-rpms # - fast-datapath-for-rhel-8-x86_64-rpms
# - rhceph-4-tools-for-rhel-8-x86_64-rpms # - rhceph-4-tools-for-rhel-8-x86_64-rpms