openstack/tripleo-common
Code Issues Proposed changes

Merge "images: install libseccomp beside podman"

Browse Source
This commit is contained in:
Zuul 2018-10-03 16:00:25 +00:00 committed by Gerrit Code Review
commit 627576ab86
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
container-images/tripleo_kolla_template_overrides.j2
View File

@ -45,14 +45,14 @@ gpgcheck=0' >> /etc/yum.repos.d/opendaylight.repo
# NOTE: Mistral executor needs to run nova-manage cells_v2 commands on
# the undercloud baremetal workflows. Undercloud mistral executor needs to run
# container image operations during overcloud deploy
{% set mistral_executor_packages_append = ['openstack-tripleo-validations', 'openstack-nova-common', 'docker', 'podman'] %}
{% set mistral_executor_packages_append = ['openstack-tripleo-validations', 'openstack-nova-common', 'docker', 'podman', 'libseccomp'] %}
# NOTE: Logrotate-crond needs to restart some non-SIGHUP friendly containers
# to make them reopen log files after the logs rotated
{% set cron_packages_append = ['docker'] %}
# NOTE: Split this apart because we'll need to backport docker but not podman
{% set cron_packages_append = cron_packages_append|default([]) + ['podman'] %}
# NOTE: Split this apart because we'll need to backport docker but not podman or libseccomp
{% set cron_packages_append = cron_packages_append|default([]) + ['podman', 'libseccomp'] %}
# FIXME (kolla review to add ceilometer to swift proxy image)
# NOTE (jaosorior): swift proxy with TLS everywhere needs these packages.
@ -87,11 +87,11 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
chmod a+rx /openstack/healthcheck
{% endblock %}
{% set neutron_metadata_agent_ovn_packages_append = ['docker', 'podman'] %}
{% set neutron_l3_agent_packages_append = ['docker', 'podman'] %}
{% set neutron_metadata_agent_ovn_packages_append = ['docker', 'podman', 'libseccomp'] %}
{% set neutron_l3_agent_packages_append = ['docker', 'podman', 'libseccomp'] %}
# Kolla doesn't currently neutron_dhcp_agent_packages on CentOS so the append
# isn't valid here.
{% set neutron_dhcp_agent_packages = ['docker', 'podman'] %}
{% set neutron_dhcp_agent_packages = ['docker', 'podman', 'libseccomp'] %}
# NOTE (jaosorior): redis with TLS everywhere needs these packages.
# redis resource-agent requires pidof