docker_container: fix ipc_mode and pid_mode idempotency (#47997)
* Fix ipc_mode and pid_mode idempotency when container names are used.
* Add changelog.
* Update pid_mode documentation.
(cherry picked from commit 35809e99bc
)
This commit is contained in:
parent
c63c4273df
commit
5153286719
3 changed files with 29 additions and 7 deletions
|
@ -0,0 +1,2 @@
|
||||||
|
bugfixes:
|
||||||
|
- "docker_container - fix ``ipc_mode`` and ``pid_mode`` idempotency if the ``host:<container-name>`` form is used (as opposed to ``host:<container-id>``)."
|
|
@ -266,7 +266,8 @@ options:
|
||||||
default: 'no'
|
default: 'no'
|
||||||
pid_mode:
|
pid_mode:
|
||||||
description:
|
description:
|
||||||
- Set the PID namespace mode for the container. Currently only supports 'host'.
|
- Set the PID namespace mode for the container.
|
||||||
|
- Note that docker-py < 2.0 only supports 'host'. Newer versions allow all values supported by the docker daemon.
|
||||||
privileged:
|
privileged:
|
||||||
description:
|
description:
|
||||||
- Give extended privileges to the container.
|
- Give extended privileges to the container.
|
||||||
|
@ -793,6 +794,8 @@ class TaskParameters(DockerBaseClass):
|
||||||
self.log_config = self._parse_log_config()
|
self.log_config = self._parse_log_config()
|
||||||
self.exp_links = None
|
self.exp_links = None
|
||||||
self.volume_binds = self._get_volume_binds(self.volumes)
|
self.volume_binds = self._get_volume_binds(self.volumes)
|
||||||
|
self.pid_mode = self._replace_container_names(self.pid_mode)
|
||||||
|
self.ipc_mode = self._replace_container_names(self.ipc_mode)
|
||||||
|
|
||||||
self.log("volumes:")
|
self.log("volumes:")
|
||||||
self.log(self.volumes, pretty_print=True)
|
self.log(self.volumes, pretty_print=True)
|
||||||
|
@ -1226,6 +1229,24 @@ class TaskParameters(DockerBaseClass):
|
||||||
self.fail("Error getting network id for %s - %s" % (network_name, str(exc)))
|
self.fail("Error getting network id for %s - %s" % (network_name, str(exc)))
|
||||||
return network_id
|
return network_id
|
||||||
|
|
||||||
|
def _replace_container_names(self, mode):
|
||||||
|
"""
|
||||||
|
Parse IPC and PID modes. If they contain a container name, replace
|
||||||
|
with the container's ID.
|
||||||
|
"""
|
||||||
|
if mode is None or not mode.startswith('container:'):
|
||||||
|
return mode
|
||||||
|
container_name = mode[len('container:'):]
|
||||||
|
# Try to inspect container to see whether this is an ID or a
|
||||||
|
# name (and in the latter case, retrieve it's ID)
|
||||||
|
container = self.client.get_container(container_name)
|
||||||
|
if container is None:
|
||||||
|
# If we can't find the container, issue a warning and continue with
|
||||||
|
# what the user specified.
|
||||||
|
self.client.module.warn('Cannot find a container with name or ID "{0}"'.format(container_name))
|
||||||
|
return mode
|
||||||
|
return 'container:{0}'.format(container['Id'])
|
||||||
|
|
||||||
|
|
||||||
class Container(DockerBaseClass):
|
class Container(DockerBaseClass):
|
||||||
|
|
||||||
|
|
|
@ -1390,8 +1390,8 @@
|
||||||
command: '/bin/sh -c "sleep 10m"'
|
command: '/bin/sh -c "sleep 10m"'
|
||||||
name: "{{ cname }}"
|
name: "{{ cname }}"
|
||||||
state: started
|
state: started
|
||||||
#ipc_mode: "container:{{ cname_h1 }}"
|
ipc_mode: "container:{{ cname_h1 }}"
|
||||||
ipc_mode: shareable
|
# ipc_mode: shareable
|
||||||
register: ipc_mode_1
|
register: ipc_mode_1
|
||||||
|
|
||||||
- name: ipc_mode (idempotency)
|
- name: ipc_mode (idempotency)
|
||||||
|
@ -1400,9 +1400,8 @@
|
||||||
command: '/bin/sh -c "sleep 10m"'
|
command: '/bin/sh -c "sleep 10m"'
|
||||||
name: "{{ cname }}"
|
name: "{{ cname }}"
|
||||||
state: started
|
state: started
|
||||||
# THIS IS CURRENTLY NOT IDEMPOTENT! SEE https://github.com/ansible/ansible/issues/45829
|
ipc_mode: "container:{{ cname_h1 }}"
|
||||||
# ipc_mode: "container:{{ cname_h1 }}"
|
# ipc_mode: shareable
|
||||||
ipc_mode: shareable
|
|
||||||
register: ipc_mode_2
|
register: ipc_mode_2
|
||||||
|
|
||||||
- name: ipc_mode (change)
|
- name: ipc_mode (change)
|
||||||
|
@ -2218,7 +2217,7 @@
|
||||||
command: '/bin/sh -c "sleep 10m"'
|
command: '/bin/sh -c "sleep 10m"'
|
||||||
name: "{{ cname }}"
|
name: "{{ cname }}"
|
||||||
state: started
|
state: started
|
||||||
pid_mode: "container:{{ pid_mode_helper.ansible_facts.docker_container.Id }}"
|
pid_mode: "container:{{ cname_h1 }}"
|
||||||
register: pid_mode_2
|
register: pid_mode_2
|
||||||
|
|
||||||
- name: pid_mode (change)
|
- name: pid_mode (change)
|
||||||
|
|
Loading…
Reference in a new issue