Skip to content

Commit

Permalink
Add idempotency for user and stop signal (#41)
Browse files Browse the repository at this point in the history
user and stop signal can be defined in images, ignore them if
they're not set
  • Loading branch information
sshnaidm committed May 11, 2020
1 parent 376f8aa commit 201151f
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions plugins/modules/podman_container.py
Original file line number Diff line number Diff line change
Expand Up @@ -1287,9 +1287,7 @@ def __init__(self, module, podman_version):
"privileged": False,
"rm": False,
"security_opt": [],
"stop_signal": 15,
"tty": False,
"user": "",
"uts": "",
}

Expand Down Expand Up @@ -1629,6 +1627,8 @@ def diffparam_security_opt(self):
def diffparam_stop_signal(self):
before = self.info['config']['stopsignal']
after = self.params['stop_signal']
if after is None:
after = before
return self._diff_update_and_compare('stop_signal', before, after)

def diffparam_tty(self):
Expand All @@ -1638,10 +1638,9 @@ def diffparam_tty(self):

def diffparam_user(self):
before = self.info['config']['user']
if self.module.params['user'] is None and before:
after = self.params['user']
if after is None:
after = before
else:
after = self.params['user']
return self._diff_update_and_compare('user', before, after)

def diffparam_uts(self):
Expand Down

0 comments on commit 201151f

Please sign in to comment.