diff options
| author | Zuul <zuul@review.opendev.org> | 2019-12-13 10:38:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-12-13 10:38:52 +0000 |
| commit | e946ef652fe0bda062c14f6cea106896ea9fe287 (patch) | |
| tree | 315c0da913709980394e881e226be47137674381 /kolla | |
| parent | 3c3d567d33931213ac862e04a740bcf6d7e72c35 (diff) | |
| parent | 79851d7929027050d0d1e76aaa28e83c141dcc55 (diff) | |
| download | kolla-e946ef652fe0bda062c14f6cea106896ea9fe287.tar.gz kolla-e946ef652fe0bda062c14f6cea106896ea9fe287.zip | |
Merge "Build images with healthcheck scripts for core services"
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 689631010..6b5302f46 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -255,6 +255,8 @@ _CLI_OPTS = [ help='OpenStack release for building kolla-toolbox'), cfg.StrOpt('openstack-branch', default='master', help='Branch for source images'), + cfg.BoolOpt('docker-healthchecks', default=True, + help='Add Kolla docker healthcheck scripts in the image') ] _BASE_OPTS = [ diff --git a/kolla/image/build.py b/kolla/image/build.py index 45b534537..a5db92984 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -708,6 +708,7 @@ class KollaWorker(object): self.debian_arch = 'ppc64el' self.images = list() self.openstack_release = conf.openstack_release + self.docker_healthchecks = conf.docker_healthchecks rpm_setup_config = ([repo_file for repo_file in conf.rpm_setup_config if repo_file is not None]) self.rpm_setup = self.build_rpm_setup(rpm_setup_config) @@ -950,6 +951,7 @@ class KollaWorker(object): 'use_dumb_init': self.use_dumb_init, 'base_package_type': self.base_package_type, 'debian_arch': self.debian_arch, + 'docker_healthchecks': self.docker_healthchecks, 'supported_distro_release': supported_distro_release, 'install_metatype': self.install_metatype, 'image_prefix': self.image_prefix, |