openstack/kolla
Code Issues Proposed changes

base: unify CentOS packages list

Browse Source 
For infra images work we need 'base' image to be 'install_type'
agnostic. So it will be the same when built for 'binary' or 'source'
install type.

Change-Id: Ied4a00e8866560d39004a34d6857ac62e22e2c0c
This commit is contained in:
Marcin Juszkiewicz
2019-12-13 10:20:25 +01:00
parent 3c3d567d33
commit e941562d94
2 changed files with 14 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
docker/base/Dockerfile.j2
View File

@@ -237,9 +237,10 @@ RUN yum-config-manager --enable rhel-7-server-optional-rpms \
if base_package_type == 'rpm' #} if base_package_type == 'rpm' #}
{% block base_redhat_binary_versionlock %}{% endblock %} {% block base_redhat_binary_versionlock %}{% endblock %}
{% if install_type == 'binary' %}
{% set base_centos_binary_packages = [ {% set base_centos_packages = [
'ca-certificates', 'ca-certificates',
'curl',
'findutils', 'findutils',
'iproute', 'iproute',
'iscsi-initiator-utils', 'iscsi-initiator-utils',
@@ -249,44 +250,22 @@ RUN yum-config-manager --enable rhel-7-server-optional-rpms \
'scsi-target-utils', 'scsi-target-utils',
'socat', 'socat',
'sudo', 'sudo',
'tar',
'which' 'which'
] %} ] %}
{% if distro_python_version.startswith('3') %} {% if distro_python_version.startswith('3') %}
{% set base_centos_binary_packages = base_centos_binary_packages + [ {% set base_centos_packages = base_centos_packages + [
'python3' 'python3'
] %} ] %}
{% else %} {% else %}
{% set base_centos_binary_packages = base_centos_binary_packages + [ {% set base_centos_packages = base_centos_packages + [
'python' 'python'
] %} ] %}
{% endif %} {% endif %}
# Install base packages # Install base packages
{{ macros.install_packages( base_centos_binary_packages | customizable("centos_binary_packages")) }} {{ macros.install_packages( base_centos_packages | customizable("centos_packages") | customizable("centos_binary_packages") | customizable("centos_source_packages") ) }}
{% endif %}
{# Endif for install_type binary #}
{% if install_type == 'source' %}
{% set base_centos_source_packages = [
'ca-certificates',
'curl',
'iproute',
'iscsi-initiator-utils',
'lvm2',
'ncurses',
'procps-ng',
'scsi-target-utils',
'socat',
'sudo',
'tar',
'which'
] %}
# Update packages
{{ macros.install_packages( base_centos_source_packages | customizable("centos_source_packages")) }}
{% endif %}
{# endif for install type is source for RPM based distros #}
{# endif for base_package_type rpm #} {# endif for base_package_type rpm #}
{% elif base_package_type == 'deb' %} {% elif base_package_type == 'deb' %}
# Ensure lsb_release exists # Ensure lsb_release exists

5
releasenotes/notes/base-unified-07fe64b8cbbdab9a.yaml Normal file
View File

@@ -0,0 +1,5 @@
---
deprecations:
- |
Deprecate 'centos_binary_packages' and 'centos_source_packages' overrides in
favour of 'centos_packages' list.