openstack
/
tripleo-common
Code Issues Proposed changes

Adjust base_centos_yum_repo_packages for stable/train 

Kolla upstream is adding centos-release-openstack-train release rpm in
master and stable/train branch after [1]. In tripleo builds this means it's configuring
both RDO Trunk master (delorean) repos and CloudSIG train repo. Mixing
both sets of repos can lead to undesired results so I'm removing
centos-release-openstack-train repo from config and letting
tripleo-repos configure as needed.

Also, I'm removing leftovers from old Ceph releases configuration.
Currently kolla is installing centos-release-ceph-nautilus so, tripleo
does not need to overrides it.

[1] https://review.opendev.org/#/c/689706

Change-Id: Ia551a7d2351bb91cc45e9c2d12f4afb4f6368bb7
(cherry picked from commit 3feedacdb7)
This commit is contained in:
Alfredo Moralejo 2019-10-28 16:44:15 +01:00
parent e70e15d104
commit db24795895
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
container-images/tripleo_kolla_template_overrides.j2
View File

@ -34,13 +34,15 @@ gpgcheck=0' >> /etc/yum.repos.d/opendaylight.repo
{% block dumb_init_installation %}{% endblock %}
# Remove EPEL and the dependencies requiring it
{% set base_centos_yum_repo_keys_remove = [
'/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud',
] %}
{% set base_centos_yum_repo_packages_remove = [
'centos-release-ceph-jewel',
'centos-release-ceph-luminous',
'centos-release-openstack-train',
'epel-release'
] %}
{% set base_centos_yum_repo_packages_append = [
'centos-release-ceph-nautilus',
'centos-release-opstools'
] %}