openstack
/
tripleo-common
Code Issues Proposed changes

Merge "[Train Only] Remove python-pip from base image" into stable/train

This commit is contained in:
Zuul 2021-02-11 23:21:58 +00:00 committed by Gerrit Code Review
parent e5d483b7ed 0cab033bbd
commit 36ad9a1a1d
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
container-images/tripleo_kolla_template_overrides.j2
View File

@ -55,6 +55,10 @@ gpgcheck=0' >> /etc/yum.repos.d/opendaylight.repo
{% set base_centos_binary_packages_remove = ['scsi-target-utils'] %}
{% if distro_python_version.startswith('2') %}
{% set base_centos_binary_packages_remove = base_centos_binary_packages_remove + ['python-pip'] %}
{% endif %}
# This installs the puppet dependency in the base container and includes helper scripts
# Rsync is required for docker-puppet.py to move the generated config to /var/lib/config-data
# Cron is required by multiple services