diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2023-04-27 11:41:55 +0200 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2023-11-14 15:17:50 +0000 |
| commit | cea076f3795010f3b870371d2ebd5d906ec81202 (patch) | |
| tree | ffefee7b4c7d77d73e6bb3efc935a96de05280b2 /ansible/module_utils | |
| parent | e545515e501ff970db147ced3b48a3a5241f2baf (diff) | |
| download | kolla-ansible-cea076f3795010f3b870371d2ebd5d906ec81202.tar.gz kolla-ansible-cea076f3795010f3b870371d2ebd5d906ec81202.zip | |
Introduce oneshot docker_restart_policy
docker_restart_policy: no causes systemd units to not get created
and we use it in CI to disable restarts on services.
Introducing oneshot policy to not create systemd unit for oneshot
containers (those that are running bootstrap tasks, like db
bootstrap and don't need a systemd unit), but still create systemd
units for long lived containers but with Restart=No.
Change-Id: I9e0d656f19143ec2fcad7d6d345b2c9387551604
Diffstat (limited to 'ansible/module_utils')
| -rw-r--r-- | ansible/module_utils/kolla_docker_worker.py | 6 | ||||
| -rw-r--r-- | ansible/module_utils/kolla_podman_worker.py | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ansible/module_utils/kolla_docker_worker.py b/ansible/module_utils/kolla_docker_worker.py index d3224f160..87beccb72 100644 --- a/ansible/module_utils/kolla_docker_worker.py +++ b/ansible/module_utils/kolla_docker_worker.py @@ -354,7 +354,7 @@ class DockerWorker(ContainerWorker): self.changed = True options = self.build_container_options() self.dc.create_container(**options) - if self.params.get('restart_policy') != 'no': + if self.params.get('restart_policy') != 'oneshot': self.changed |= self.systemd.create_unit_file() def recreate_or_restart_container(self): @@ -397,7 +397,7 @@ class DockerWorker(ContainerWorker): if not container['Status'].startswith('Up '): self.changed = True - if self.params.get('restart_policy') == 'no': + if self.params.get('restart_policy') == 'oneshot': self.dc.start(container=self.params.get('name')) else: self.systemd.create_unit_file() @@ -466,7 +466,7 @@ class DockerWorker(ContainerWorker): msg="No such container: {}".format(name)) else: self.changed = True - if self.params.get('restart_policy') != 'no': + if self.params.get('restart_policy') != 'oneshot': self.systemd.create_unit_file() if not self.systemd.restart(): self.module.fail_json( diff --git a/ansible/module_utils/kolla_podman_worker.py b/ansible/module_utils/kolla_podman_worker.py index c0bf75181..dd215174e 100644 --- a/ansible/module_utils/kolla_podman_worker.py +++ b/ansible/module_utils/kolla_podman_worker.py @@ -535,7 +535,7 @@ class PodmanWorker(ContainerWorker): if container.status != 'running': self.changed = True - if self.params.get('restart_policy') == 'no': + if self.params.get('restart_policy') == 'oneshot': container = self.check_container() container.start() else: @@ -583,7 +583,7 @@ class PodmanWorker(ContainerWorker): elif not (container.status == 'exited' or container.status == 'stopped'): self.changed = True - if self.params.get('restart_policy') != 'no': + if self.params.get('restart_policy') != 'oneshot': self.systemd.create_unit_file() self.systemd.stop() else: |