Merge branch 'master' into pod_replica_fusion

Author: sdodsley

README.md

@@ -104,7 +104,7 @@ All modules are idempotent with the exception of modules that change or set pass
 - purefa_ad - manage FlashArray Active Directoy accounts
 - purefa_admin - Configure Pure Storage FlashArray Global Admin settings
 - purefa_alert - manage email alert settings on the FlashArray
-- purefa_apiclient - manageFlashArray API clients
+- purefa_apiclient - manage FlashArray API clients
 - purefa_arrayname - manage the name of the FlashArray
 - pureaf_audits - get FlashArray audit events
 - purefa_banner - manage the CLI and GUI login banner of the FlashArray

changelogs/fragments/691_vol_fleet.yaml

@@ -0,0 +1,2 @@
+minor_changes:
+ - purefa_volume - Added ``context`` parameter to support fleet operations

changelogs/fragments/693_update_smtp.yaml

@@ -0,0 +1,2 @@
+minor_changes:
+ - purefa_smtp - Added support for additional parameters, including encryption mode and email prefixs and email sender name.

changelogs/fragments/695_host_fusion.yaml

@@ -0,0 +1,5 @@
+minor_changes:
+ - purefa_host - Added Fusion support
+known_issues:
+ - FlashArray//CBS is not currently supported as a member of a Fusion fleet
+ - All Fusion fleet members will be assumed to be at the same Purity//FA version level as the array connected to by Ansible.

changelogs/fragments/696_vgroup_v2.yaml

@@ -0,0 +1,2 @@
+minor_changes:
+ - purefa_vg - Added support for Fusion

changelogs/fragments/697_fusion_pods.yaml

@@ -0,0 +1,2 @@
+minor_changes:
+ - purefa_pods - Added support for Fusion with ``context`` parameter.

changelogs/fragments/699_gh_fusion.yaml

@@ -0,0 +1,2 @@
+minor_changes:
+ - purefa_hg - Added support for Fusion

changelogs/fragments/707_fusion_pg.yaml

@@ -0,0 +1,2 @@
+minor_changes:
+ - purefa_pg - Added Fusion support.

plugins/modules/purefa_certs.py

@@ -502,7 +502,7 @@ def main():
     if not HAS_PYCOUNTRY:
         module.fail_json(msg="pycountry sdk is required for this module")
 
-    email_pattern = r"^[\w-\.]+@([\w-]+\.)+[\w-]{2,6}$"
+    email_pattern = r"^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$"
     array = get_array(module)
     api_version = array.get_rest_version()
 

plugins/modules/purefa_fleet.py

@@ -34,6 +34,8 @@
     - Define whether to add or remove member from a fleet.
     - Create a new fleet if one does not exist.
       This will use the current array as the first member.
+    - Fleet deletion can only occiur when the current array
+      is the only fleet member.
     default: present
     choices: [ absent, present, create ]
     type: str
@@ -77,6 +79,13 @@
     state: absent
     fa_url: 10.10.10.2
     api_token: e31060a7-21fc-e277-6240-25983c6c4592
+
+- name: Delete fleet foo
+  purestorage.flasharray.purefa_fleet:
+    name: foo
+    state: absent
+    fa_url: 10.10.10.2
+    api_token: e31060a7-21fc-e277-6240-25983c6c4592
 """
 
 RETURN = r"""
@@ -119,6 +128,7 @@
 VERSION = 1.5
 USER_AGENT_BASE = "Ansible"
 MIN_REQUIRED_API_VERSION = "2.38"
+DELETE_FLEET_API_VERSION = "2.39"
 
 
 def create_fleet(module, array):
@@ -135,6 +145,29 @@ def create_fleet(module, array):
     module.exit_json(changed=changed)
 
 
+def delete_fleet(module, array):
+    """Delete the fleet.
+
+    Only works when the current array is the only remaining
+    memebr of the fleet'
+    """
+    changed = True
+    api_version = array.get_rest_version()
+    if LooseVersion(DELETE_FLEET_API_VERSION) <= LooseVersion(api_version):
+        res = array.delete_fleets(names=[module.params["name"]])
+        if res.status_code != 200:
+            module.fail_json(
+                msg="Fleet {0} deletion failed. Error: {1}".format(
+                    module.params["name"], res.errors[0].message
+                )
+            )
+    else:
+        module.fail_json(
+            msg="Purity//FA version not supported. Minimum version required: 6.8.2"
+        )
+    module.exit_json(changed=changed)
+
+
 def add_fleet_members(module, array):
     """Add new member to the fleet"""
     changed = False
@@ -199,8 +232,6 @@ def add_fleet_members(module, array):
 def delete_fleet_members(module, array):
     """Delete member from a fleet"""
     changed = False
-    if not module.params["member_url"] and not module.params["member_api"]:
-        module.fail_json(msg="missing required arguments: member_api, member_url")
     if HAS_URLLIB3 and module.params["disable_warnings"]:
         urllib3.disable_warnings()
     if HAS_DISTRO:
@@ -279,7 +310,11 @@ def main():
         )
     )
 
-    module = AnsibleModule(argument_spec, supports_check_mode=True)
+    required_together = [["member_url", "member_api"]]
+
+    module = AnsibleModule(
+        argument_spec, required_together=required_together, supports_check_mode=True
+    )
 
     if not HAS_PURESTORAGE:
         module.fail_json(msg="py-pure-client sdk is required for this module")
@@ -311,8 +346,10 @@ def main():
         rename_fleet(module, array)
     elif state == "present" and fleet:
         add_fleet_members(module, array)
-    elif state == "absent" and fleet:
+    elif state == "absent" and fleet and module.params["member_url"]:
         delete_fleet_members(module, array)
+    elif state == "absent" and fleet:
+        delete_fleet(module, array)
     else:
         module.exit_json(changed=False)