1
0
Fork 0
mirror of https://github.com/containers/ansible-podman-collections.git synced 2026-03-22 02:29:08 +00:00

Fixed idempotency with cpus parameter (#581)

* Added cpu_quota parameter and fixed #559

Signed-off-by: Holger Mueller <holger.mueller@inovex.de>

* force float for cpu parameter in diff

Signed-off-by: Holger Mueller <holger.mueller@inovex.de>

* fixed typo

Signed-off-by: Holger Mueller <holger.mueller@inovex.de>

* revert linebreak caused by linting with too short lines

Signed-off-by: Holger Mueller <holger.mueller@inovex.de>

* removed quota parameter from patch

Signed-off-by: Holger Mueller <holger.mueller@inovex.de>

* readded already existing quota key to defaults

Signed-off-by: Holger Mueller <holger.mueller@inovex.de>

---------

Signed-off-by: Holger Mueller <holger.mueller@inovex.de>
Co-authored-by: Holger Mueller <holger.mueller@inovex.de>
This commit is contained in:
Holger Müller 2023-08-03 14:29:06 +02:00 committed by GitHub
parent 4e2f42eea6
commit 2914785411
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions

View file

@ -737,7 +737,7 @@ class PodmanContainerDiff:
return self._diff_update_and_compare('annotation', before, after)
def diffparam_env_host(self):
# It's impossible to get from inspest, recreate it if not default
# It's impossible to get from inspect, recreate it if not default
before = False
after = self.params['env_host']
return self._diff_update_and_compare('env_host', before, after)
@ -826,7 +826,8 @@ class PodmanContainerDiff:
def diffparam_cpu_period(self):
before = self.info['hostconfig']['cpuperiod']
after = self.params['cpu_period']
# if cpu_period left to default keep settings
after = self.params['cpu_period'] or before
return self._diff_update_and_compare('cpu_period', before, after)
def diffparam_cpu_rt_period(self):
@ -845,8 +846,9 @@ class PodmanContainerDiff:
return self._diff_update_and_compare('cpu_shares', before, after)
def diffparam_cpus(self):
before = int(self.info['hostconfig']['nanocpus']) / 1000000000
after = self.params['cpus']
before = self.info['hostconfig']['nanocpus'] / 1000000000
# if cpus left to default keep settings
after = float(self.params['cpus'] or before)
return self._diff_update_and_compare('cpus', before, after)
def diffparam_cpuset_cpus(self):

View file

@ -149,7 +149,7 @@ options:
type: raw
cpu_period:
description:
- Limit the CPU real-time period in microseconds
- Limit the CPU CFS (Completely Fair Scheduler) period
type: int
cpu_rt_period:
description: