Browse Source

Merge "Install dumb-init rpm" into stable/queens

changes/76/681876/1
Zuul 1 week ago
parent
commit
8d42051055
1 changed files with 5 additions and 0 deletions
  1. 5
    0
      container-images/tripleo_kolla_template_overrides.j2

+ 5
- 0
container-images/tripleo_kolla_template_overrides.j2 View File

@@ -29,6 +29,11 @@ gpgcheck=0' >> /etc/yum.repos.d/opendaylight.repo
29 29
 # Rsync is required for docker-puppet.py to move the generated config to /var/lib/config-data
30 30
 # Cron is required by multiple services
31 31
 {% set base_centos_binary_packages_append = ['openstack-tripleo-common-container-base', 'rsync', 'cronie', 'crudini', 'openstack-selinux', 'ansible', 'python-shade', 'puppet-tripleo', 'python2-kubernetes'] %}
32
+
33
+# Override dumb-init installation
34
+{% block dumb_init_installation %}{% endblock %}
35
+{% set base_centos_binary_packages_append = base_centos_binary_packages_append + ['dumb-init'] %}
36
+
32 37
 {% set nova_scheduler_packages_append = ['openstack-tripleo-common'] %}
33 38
 
34 39
 # Required for mistral-db-populate to load tripleo custom actions on

Loading…
Cancel
Save