diff options
| author | Felix Fontein <felix@fontein.de> | 2018-11-05 01:26:13 +0100 |
|---|---|---|
| committer | Will Thames <will@thames.id.au> | 2018-11-05 10:26:13 +1000 |
| commit | 35809e99bcc05c615fbfd93a1b83568d0c4a3ee1 (patch) | |
| tree | 274b2f890f540d11d1389470bd99925f718ab8e2 /test/integration/targets/docker_container | |
| parent | 3cca4185be3fd55cc580bdf7c0f85562a997371b (diff) | |
| download | ansible-35809e99bcc05c615fbfd93a1b83568d0c4a3ee1.tar.gz | |
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.
Diffstat (limited to 'test/integration/targets/docker_container')
| -rw-r--r-- | test/integration/targets/docker_container/tasks/tests/options.yml | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/test/integration/targets/docker_container/tasks/tests/options.yml b/test/integration/targets/docker_container/tasks/tests/options.yml index 84b2e65cb9..6bff35c846 100644 --- a/test/integration/targets/docker_container/tasks/tests/options.yml +++ b/test/integration/targets/docker_container/tasks/tests/options.yml @@ -1781,8 +1781,8 @@ command: '/bin/sh -c "sleep 10m"' name: "{{ cname }}" state: started - #ipc_mode: "container:{{ cname_h1 }}" - ipc_mode: shareable + ipc_mode: "container:{{ cname_h1 }}" + # ipc_mode: shareable register: ipc_mode_1 - name: ipc_mode (idempotency) @@ -1791,9 +1791,8 @@ command: '/bin/sh -c "sleep 10m"' name: "{{ cname }}" state: started - # THIS IS CURRENTLY NOT IDEMPOTENT! SEE https://github.com/ansible/ansible/issues/45829 - # ipc_mode: "container:{{ cname_h1 }}" - ipc_mode: shareable + ipc_mode: "container:{{ cname_h1 }}" + # ipc_mode: shareable register: ipc_mode_2 - name: ipc_mode (change) @@ -2694,7 +2693,7 @@ command: '/bin/sh -c "sleep 10m"' name: "{{ cname }}" state: started - pid_mode: "container:{{ pid_mode_helper.ansible_facts.docker_container.Id }}" + pid_mode: "container:{{ cname_h1 }}" register: pid_mode_2 ignore_errors: yes # docker-py < 2.0 does not support "arbitrary" pid_mode values |