Rolled back bucket_apply.yml and s3_account_apply.yml to previous version

Author: genegr

ansible-fb/playbooks/bucket_apply.yml

@@ -11,24 +11,13 @@
     versioning: "{{ versioning | default('absent') }}"
 
   tasks:
-    - name: Build base module parameters
-      ansible.builtin.set_fact:
-        _params:
-          name: "{{ bucket_name }}"
-          account: "{{ account_name }}"
-          state: present
-          fb_url: "{{ fb_url }}"
-          api_token: "{{ api_token }}"
-
-    - name: Add versioning if enabled or suspended
-      ansible.builtin.set_fact:
-        _params: "{{ _params | combine({'versioning': versioning}) }}"
-      when: versioning in ['enabled', 'suspended']
-
-    - name: Add quota and hard_limit if quota is specified
-      ansible.builtin.set_fact:
-        _params: "{{ _params | combine({'quota': quota, 'hard_limit': hard_limit | bool}) }}"
-      when: quota is defined and quota not in [None, '', 'None', 'null']
-
     - name: Ensure S3 bucket is present
-      purestorage.flashblade.purefb_bucket: "{{ _params }}"
+      purestorage.flashblade.purefb_bucket:
+        name: "{{ bucket_name }}"
+        account: "{{ account_name }}"
+        state: present
+        versioning: "{{ versioning }}"
+        quota: "{{ quota | default(omit) }}"
+        hard_limit: "{{ hard_limit | default(omit) }}"
+        fb_url: "{{ fb_url }}"
+        api_token: "{{ api_token }}"

ansible-fb/playbooks/s3_account_apply.yml

@@ -9,18 +9,11 @@
     account_name: "{{ account_name | mandatory }}"
 
   tasks:
-    - name: Build base module parameters
-      ansible.builtin.set_fact:
-        _params:
-          name: "{{ account_name }}"
-          state: present
-          fb_url: "{{ fb_url }}"
-          api_token: "{{ api_token }}"
-
-    - name: Add quota and hard_limit if quota is specified
-      ansible.builtin.set_fact:
-        _params: "{{ _params | combine({'quota': quota, 'hard_limit': hard_limit | bool}) }}"
-      when: quota is defined and quota not in [None, '', 'None', 'null']
-
     - name: Ensure S3 object store account is present
-      purestorage.flashblade.purefb_s3acc: "{{ _params }}"
+      purestorage.flashblade.purefb_s3acc:
+        name: "{{ account_name }}"
+        state: present
+        quota: "{{ quota | default(omit) }}"
+        hard_limit: "{{ hard_limit | default(omit) }}"
+        fb_url: "{{ fb_url }}"
+        api_token: "{{ api_token }}"