aboutsummaryrefslogtreecommitdiff
path: root/kolla/image
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-04-13 14:57:40 +0000
committerGerrit Code Review <review@openstack.org>2019-04-13 14:57:40 +0000
commit32693b83385c3b76ba0edf7e426bb110c6c335ae (patch)
treec687b63e3e37128de0e72695c7d4f2a0563190f2 /kolla/image
parent68b17a2bed7bf47a0fdc63c9e47354cc6c0300fa (diff)
parentfb4cb9efda5a522ba0d837047385b61275d09150 (diff)
downloadkolla-32693b83385c3b76ba0edf7e426bb110c6c335ae.tar.gz
kolla-32693b83385c3b76ba0edf7e426bb110c6c335ae.zip
Merge "Add config option use_dumb_init to add it to container images"
Diffstat (limited to 'kolla/image')
-rwxr-xr-xkolla/image/build.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/kolla/image/build.py b/kolla/image/build.py
index 7683d7904..8e7b546e3 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -681,6 +681,7 @@ class KollaWorker(object):
else:
self.namespace = conf.namespace
self.base = conf.base
+ self.use_dumb_init = conf.use_dumb_init
self.base_tag = conf.base_tag
self.install_type = conf.install_type
self.tag = conf.tag
@@ -926,6 +927,7 @@ class KollaWorker(object):
'base_image': self.conf.base_image,
'base_distro_tag': self.base_tag,
'base_arch': self.base_arch,
+ 'use_dumb_init': self.use_dumb_init,
'base_package_type': self.base_package_type,
'debian_arch': self.debian_arch,
'supported_distro_release': supported_distro_release,