docker_volume: improve force option (deprecate, add new option) (#51145)

* docker_volume: Deprecating force option, adding recreate option.

* Add changelog.

* Remove mis-placed force: yes for docker_volume.

test/integration/targets/docker_swarm_service/tasks/main.yml

@@ -52,7 +52,6 @@
       docker_volume:
         name: "{{ item }}"
         state: absent
-        force: yes
       loop: "{{ volume_names }}"
       ignore_errors: yes
 

test/integration/targets/docker_swarm_service/tasks/tests/options.yml

@@ -1844,7 +1844,6 @@
   docker_volume:
     name: "{{ volume_name }}"
     state: absent
-    force: yes
   loop:
     - "{{ volume_name_1 }}"
     - "{{ volume_name_2 }}"

test/integration/targets/docker_volume/tasks/main.yml

@@ -17,7 +17,6 @@
     docker_volume:
       name: "{{ item }}"
       state: absent
-      force: yes
     with_items: "{{ vnames }}"
 
   when: docker_py_version is version('1.10.0', '>=') and docker_api_version is version('1.20', '>=')  # FIXME: find out API version!

test/integration/targets/docker_volume/tasks/tests/basic.yml

@@ -20,12 +20,18 @@
     name: "{{ vname }}"
   register: create_2
 
-- name: Create a volume (force)
+- name: "Create a volume (recreate: options-changed)"
   docker_volume:
     name: "{{ vname }}"
-    force: yes
+    recreate: options-changed
   register: create_3
 
+- name: "Create a volume (recreate: always)"
+  docker_volume:
+    name: "{{ vname }}"
+    recreate: always
+  register: create_4
+
 - name: Remove a volume
   docker_volume:
     name: "{{ vname }}"
@@ -43,6 +49,7 @@
     - create_1 is changed
     - create_2 is not changed
     - create_3 is not changed
+    - create_4 is changed
     - absent_1 is changed
     - absent_2 is not changed
 
@@ -80,7 +87,7 @@
       o: size=200m,uid=1000
   register: driver_options_3
 
-- name: Create a volume with options (changed, force)
+- name: "Create a volume with options (changed, recreate: options-changed)"
   docker_volume:
     name: "{{ vname }}"
     driver: local
@@ -88,7 +95,7 @@
       type: tempfs
       device: tmpfs
       o: size=200m,uid=1000
-    force: yes
+    recreate: options-changed
   register: driver_options_4
 
 - name: Cleanup
@@ -130,12 +137,12 @@
       ansible.test.1: hello
   register: driver_labels_3
 
-- name: Create a volume with labels (less, force)
+- name: "Create a volume with labels (less, recreate: options-changed)"
   docker_volume:
     name: "{{ vname }}"
     labels:
       ansible.test.1: hello
-    force: yes
+    recreate: options-changed
   register: driver_labels_4
 
 - name: Create a volume with labels (more)
@@ -146,13 +153,13 @@
       ansible.test.3: ansible
   register: driver_labels_5
 
-- name: Create a volume with labels (more, force)
+- name: "Create a volume with labels (more, recreate: options-changed)"
   docker_volume:
     name: "{{ vname }}"
     labels:
       ansible.test.1: hello
       ansible.test.3: ansible
-    force: yes
+    recreate: options-changed
   register: driver_labels_6
 
 - name: Cleanup

test/integration/targets/docker_volume_facts/tasks/main.yml

@@ -8,7 +8,6 @@
     docker_volume:
       name: "{{ cname }}"
       state: absent
-      force: yes
 
   - name: Inspect a non-present volume
     docker_volume_facts:
@@ -44,7 +43,6 @@
     docker_volume:
       name: "{{ cname }}"
       state: absent
-      force: yes
 
   - assert:
       that: