diff options
| author | Rabi Mishra <ramishra@redhat.com> | 2019-03-29 07:45:19 +0530 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2019-04-03 08:27:45 +0000 |
| commit | fb4cb9efda5a522ba0d837047385b61275d09150 (patch) | |
| tree | 7af84476e2d6a59c54f38a63a0e3eac9db6b3e69 /kolla | |
| parent | 636fce475b7b1525f4ad353d2a0740f784d22aad (diff) | |
| download | kolla-fb4cb9efda5a522ba0d837047385b61275d09150.tar.gz kolla-fb4cb9efda5a522ba0d837047385b61275d09150.zip | |
Add config option use_dumb_init to add it to container images
Usage of dumb-init can also be disabled from cli with
`--nouse-dumb-init` when building images.
Also moves ENTRYPOINT outside of dumb_init_installation
block.
Change-Id: Id32d54fc9913b83cf121ede5a5e265e0772062ae
Related-Bug: #1821970
Diffstat (limited to 'kolla')
| -rwxr-xr-x | kolla/common/config.py | 2 | ||||
| -rwxr-xr-x | kolla/image/build.py | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index 4946e80ba..f760e3210 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -184,6 +184,8 @@ _CLI_OPTS = [ cfg.StrOpt('base-arch', default=hostarch, choices=BASE_ARCH, help='The base architecture. Default is same as host.'), + cfg.BoolOpt('use-dumb-init', default=True, + help='Use dumb-init as init system in containers'), cfg.BoolOpt('debug', short='d', default=False, help='Turn on debugging log level'), cfg.BoolOpt('skip-parents', default=False, 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, |