openstack
/
tripleo-common
Code Issues Proposed changes

Add ENTRYPOINT to the dumb init install block 

The dumb init install block in queens needs to be modified to add the
ENTRYPOINT due to a change in kolla.

> This change is not needed in master because the dumb-init ENTRYPOINT
  is handled differently.

Change-Id: I995477e1363fbf6cae2bdf1c146b841e8c84524b
Signed-off-by: Kevin Carter <kecarter@redhat.com>
This commit is contained in:
Kevin Carter 2019-09-12 13:48:06 -05:00
parent 8d42051055
commit eae1fd4d2f
No known key found for this signature in database
GPG Key ID: CE94BD890A47B20A
1 changed files with 3 additions and 1 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

@ -31,7 +31,9 @@ gpgcheck=0' >> /etc/yum.repos.d/opendaylight.repo
{% set base_centos_binary_packages_append = ['openstack-tripleo-common-container-base', 'rsync', 'cronie', 'crudini', 'openstack-selinux', 'ansible', 'python-shade', 'puppet-tripleo', 'python2-kubernetes'] %}
# Override dumb-init installation
{% block dumb_init_installation %}{% endblock %}
{% block dumb_init_installation %}
ENTRYPOINT ["dumb-init", "--single-child", "--"]
{% endblock %}
{% set base_centos_binary_packages_append = base_centos_binary_packages_append + ['dumb-init'] %}
{% set nova_scheduler_packages_append = ['openstack-tripleo-common'] %}