Update blockdevmap.py (sky-uk#88)

+ Update blockdevmap.py from upstream to support python2
+ Add check for Ansible <=2.10.6 (2.10.7 has an incompatibility which causes us to fail to delete from Route53)

_dependencies/library/blockdevmap.py

@@ -252,6 +252,12 @@
 except:
     pass
 
+# FileNotFoundError does not exist in python2 - it is an IOError
+try:
+    FileNotFoundError
+except NameError:
+    FileNotFoundError = IOError
+
 try:
     from urllib.request import urlopen
 except ImportError:
@@ -412,9 +418,9 @@ def __init__(self, **kwds):
         response__block_device_mapping = urlopen('http://169.254.169.254/latest/meta-data/block-device-mapping/')
         block_device_mappings = response__block_device_mapping.read().decode().split("\n")
         for block_device_mappings__ephemeral_id in [dev for dev in block_device_mappings if dev.startswith('ephemeral')]:
-            with urlopen("http://169.254.169.254/latest/meta-data/block-device-mapping/" + block_device_mappings__ephemeral_id) as response__ephemeral_device:
-                block_device_mappings__ephemeral_mapped = response__ephemeral_device.read().decode()
-                instance_store_map.append({'ephemeral_id': block_device_mappings__ephemeral_id, 'ephemeral_map': block_device_mappings__ephemeral_mapped})
+            response__ephemeral_device = urlopen("http://169.254.169.254/latest/meta-data/block-device-mapping/" + block_device_mappings__ephemeral_id)
+            block_device_mappings__ephemeral_mapped = response__ephemeral_device.read().decode()
+            instance_store_map.append({'ephemeral_id': block_device_mappings__ephemeral_id, 'ephemeral_map': block_device_mappings__ephemeral_mapped})
 
         instance_store_count = 0
         self.device_map = self.get_lsblk()
@@ -473,21 +479,17 @@ def main():
     if not (len(sys.argv) > 1 and sys.argv[1] == "console"):
         module = AnsibleModule(argument_spec={"cloud_type": {"type": "str", "required": True, "choices": ['aws', 'gcp', 'azure', 'lsblk']}}, supports_check_mode=True)
     else:
-        # For testing without Ansible (e.g on Windows)
-        class cDummyAnsibleModule():
-            params = {"cloud_type": "azure"}
-
+        class cDummyAnsibleModule():    # For testing without Ansible (e.g on Windows)
+            def __init__(self):
+                self.params={}
             def exit_json(self, changed, **kwargs):
                 print(changed, json.dumps(kwargs, sort_keys=True, indent=4, separators=(',', ': ')))
-
-            def warn(self, msg):
-                print("[WARNING]: " + msg)
-
             def fail_json(self, msg):
                 print("Failed: " + msg)
                 exit(1)
 
         module = cDummyAnsibleModule()
+        module.params = {"cloud_type": sys.argv[2]}
 
     if module.params['cloud_type'] == 'aws':
         blockdevmap = cAwsMapper(module=module)
@@ -504,4 +506,4 @@ def fail_json(self, msg):
 
 
 if __name__ == '__main__':
-    main()
+    main()

_dependencies/tasks/main.yml

@@ -30,7 +30,7 @@
 
 - name: Preflight check
   block:
-    - assert: { that: "ansible_version.full is version_compare('2.9', '>=')", fail_msg: "Ansible >=2.9 required." }
+    - assert: { that: "ansible_version.full is version_compare('2.9.6', '>=') and ansible_version.full is version_compare('2.10.6', '<=')", fail_msg: "2.10.6 >= Ansible >= 2.9.6 required." }  #2.10.7 has issue with AWS DNS: https://github.com/ansible-collections/community.aws/issues/523
     - assert: { that: "app_name is defined and app_name != ''", fail_msg: "Please define app_name" }
     - assert: { that: "app_class is defined and app_class != ''", fail_msg: "Please define app_class" }
     - assert: { that: "cluster_vars is defined", fail_msg: "Please define cluster_vars" }