diff options
| author | Zuul <zuul@review.opendev.org> | 2019-12-16 12:21:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-12-16 12:21:34 +0000 |
| commit | 2137cba1e0b8793dd683e58aca78d529a1d359fc (patch) | |
| tree | 2f990c786d5a8984b3dbae78d6f072b6133745cd | |
| parent | f1eb7a5fd770a656feb44e1de989b2c4da0541a3 (diff) | |
| parent | e941562d948c98735e4b2074025c89dba436c89e (diff) | |
| download | kolla-2137cba1e0b8793dd683e58aca78d529a1d359fc.tar.gz kolla-2137cba1e0b8793dd683e58aca78d529a1d359fc.zip | |
Merge "base: unify CentOS packages list"
| -rw-r--r-- | docker/base/Dockerfile.j2 | 39 | ||||
| -rw-r--r-- | releasenotes/notes/base-unified-07fe64b8cbbdab9a.yaml | 5 |
2 files changed, 14 insertions, 30 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index a1e000681..86c8286dd 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -237,9 +237,10 @@ RUN yum-config-manager --enable rhel-7-server-optional-rpms \ if base_package_type == 'rpm' #} {% block base_redhat_binary_versionlock %}{% endblock %} - {% if install_type == 'binary' %} -{% set base_centos_binary_packages = [ + +{% set base_centos_packages = [ 'ca-certificates', + 'curl', 'findutils', 'iproute', 'iscsi-initiator-utils', @@ -249,44 +250,22 @@ RUN yum-config-manager --enable rhel-7-server-optional-rpms \ 'scsi-target-utils', 'socat', 'sudo', + 'tar', 'which' ] %} {% if distro_python_version.startswith('3') %} -{% set base_centos_binary_packages = base_centos_binary_packages + [ + {% set base_centos_packages = base_centos_packages + [ 'python3' -] %} + ] %} {% else %} -{% set base_centos_binary_packages = base_centos_binary_packages + [ + {% set base_centos_packages = base_centos_packages + [ 'python' -] %} + ] %} {% endif %} # Install base packages -{{ macros.install_packages( base_centos_binary_packages | customizable("centos_binary_packages")) }} - {% endif %} - {# Endif for install_type binary #} +{{ macros.install_packages( base_centos_packages | customizable("centos_packages") | customizable("centos_binary_packages") | customizable("centos_source_packages") ) }} - {% 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 #} {% elif base_package_type == 'deb' %} # Ensure lsb_release exists diff --git a/releasenotes/notes/base-unified-07fe64b8cbbdab9a.yaml b/releasenotes/notes/base-unified-07fe64b8cbbdab9a.yaml new file mode 100644 index 000000000..951f4b9c6 --- /dev/null +++ b/releasenotes/notes/base-unified-07fe64b8cbbdab9a.yaml @@ -0,0 +1,5 @@ +--- +deprecations: + - | + Deprecate 'centos_binary_packages' and 'centos_source_packages' overrides in + favour of 'centos_packages' list. |