fix: fix tmpfs_size and tmpfs_mode not being set

ansible-collections · Feb 10, 2023 · 749e3a5 · 749e3a5
1 parent 54a3dc1
commit 749e3a5
Show file tree

Hide file tree

Showing 4 changed files with 135 additions and 5 deletions.
diff --git a/plugins/module_utils/module_container/docker_api.py b/plugins/module_utils/module_container/docker_api.py
@@ -994,8 +994,8 @@ def _set_values_mounts(module, data, api_version, options, values):
                     tmpfs_opts['Mode'] = mount.get('tmpfs_mode')
                 if mount.get('tmpfs_size'):
                     tmpfs_opts['SizeBytes'] = mount.get('tmpfs_size')
-                if mount.get('tmpfs_opts'):
-                    mount_res['TmpfsOptions'] = mount.get('tmpfs_opts')
+                if tmpfs_opts:
+                    mount_res['TmpfsOptions'] = tmpfs_opts
             mounts.append(mount_res)
         data['HostConfig']['Mounts'] = mounts
     if 'volumes' in values:

diff --git a/plugins/modules/docker_container.py b/plugins/modules/docker_container.py
@@ -1165,6 +1165,18 @@
       # The "NONE" check needs to be specified
       test: ["NONE"]
 
+- name: Create a tmpfs with a size and mode
+  community.docker.docker_container:
+    name: tmpfs test
+    image: ubuntu:22.04
+    state: started
+    mount
+    mounts:
+      - type: tmpfs
+        target: /cache
+        tmpfs_mode: "1700" # only readable to the owner
+        tmpfs_size: "16G"
+
 - name: Start container with block device read limit
   community.docker.docker_container:
     name: test

diff --git a/tests/integration/targets/docker_container/tasks/tests/mounts-volumes.yml b/tests/integration/targets/docker_container/tasks/tests/mounts-volumes.yml
@@ -161,6 +161,127 @@
     - mounts_7 is changed
     - mounts_8 is not changed
 
+####################################################################
+## tmpfs ###########################################################
+####################################################################
+
+- name: tmpfs
+  docker_container:
+    image: "{{ docker_test_image_alpine }}"
+    command: '/bin/sh -c "sleep 10m"'
+    name: "{{ cname }}"
+    state: started
+    mounts:
+    - target: /cache1
+      type: tmpfs
+      tmpfs_mode: "1777"
+      tmpfs_size: "1GB"
+    - target: /cache2
+      type: tmpfs
+      tmpfs_mode: "1777"
+      tmpfs_size: "1GB"
+    force_kill: true
+  register: tmpfs_1
+
+- name: tmpfs (idempotency)
+  docker_container:
+    image: "{{ docker_test_image_alpine }}"
+    command: '/bin/sh -c "sleep 10m"'
+    name: "{{ cname }}"
+    state: started
+    mounts:
+    - target: /cache2
+      type: tmpfs
+      tmpfs_mode: "1777"
+      tmpfs_size: "1GB"
+    - target: /cache1
+      type: tmpfs
+      tmpfs_mode: "1777"
+      tmpfs_size: "1GB"
+    force_kill: true
+  register: tmpfs_2
+
+- name: tmpfs (more mounts)
+  docker_container:
+    image: "{{ docker_test_image_alpine }}"
+    command: '/bin/sh -c "sleep 10m"'
+    name: "{{ cname }}"
+    state: started
+    mounts:
+    - target: /cache1
+      type: tmpfs
+      tmpfs_mode: "1777"
+      tmpfs_size: "1GB"
+    force_kill: true
+    - target: /cache2
+      type: tmpfs
+      tmpfs_mode: "1777"
+      tmpfs_size: "1GB"
+    force_kill: true
+    - target: /cache3
+      type: tmpfs
+      tmpfs_mode: "1777"
+      tmpfs_size: "1GB"
+    force_kill: true
+  register: tmpfs_3
+
+- name: tmpfs (less mount)
+  docker_container:
+    image: "{{ docker_test_image_alpine }}"
+    command: '/bin/sh -c "sleep 10m"'
+    name: "{{ cname }}"
+    state: started
+    mounts:
+    - target: /cache1
+      type: tmpfs
+      tmpfs_mode: "1777"
+      tmpfs_size: "1GB"
+    force_kill: true
+  register: tmpfs_4
+
+- name: tmpfs (change mode)
+  docker_container:
+    image: "{{ docker_test_image_alpine }}"
+    command: '/bin/sh -c "sleep 10m"'
+    name: "{{ cname }}"
+    state: started
+    mounts:
+    - target: /cache1
+      type: tmpfs
+      tmpfs_mode: "1700"
+      tmpfs_size: "1GB"
+    force_kill: true
+  register: tmpfs_5
+
+- name: tmpfs (change size)
+  docker_container:
+    image: "{{ docker_test_image_alpine }}"
+    command: '/bin/sh -c "sleep 10m"'
+    name: "{{ cname }}"
+    state: started
+    mounts:
+    - target: /cache1
+      type: tmpfs
+      tmpfs_mode: "1700"
+      tmpfs_size: "2GB"
+    force_kill: true
+  register: tmpfs_5
+
+- name: cleanup
+  docker_container:
+    name: "{{ cname }}"
+    state: absent
+    force_kill: yes
+  diff: no
+
+- assert:
+    that:
+    - tmpfs_1 is changed
+    - tmpfs_2 is not changed
+    - tmpfs_3 is changed
+    - tmpfs_4 is changed
+    - tmpfs_5 is changed
+
 ####################################################################
 ## mounts + volumes ################################################
 ####################################################################

diff --git a/tests/integration/targets/docker_swarm_service/tasks/tests/mounts.yml b/tests/integration/targets/docker_swarm_service/tasks/tests/mounts.yml
@@ -418,7 +418,6 @@
         type: "tmpfs"
         tmpfs_size: "50M"
   register: mounts_tmpfs_size_1
-  ignore_errors: yes
 
 - name: mounts.tmpfs_size (idempotency)
   docker_swarm_service:
@@ -432,7 +431,6 @@
         type: "tmpfs"
         tmpfs_size: "50M"
   register: mounts_tmpfs_size_2
-  ignore_errors: yes
 
 - name: mounts.tmpfs_size (change)
   docker_swarm_service:
@@ -446,7 +444,6 @@
         type: "tmpfs"
         tmpfs_size: "25M"
   register: mounts_tmpfs_size_3
-  ignore_errors: yes
 
 - name: cleanup
   docker_swarm_service: