Handle HTTP 404 Not Found errors when state == absent (resolves #253) (…

…#264)

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>

plugins/modules/certificate_authority.py

@@ -295,7 +295,10 @@ def main():
         if state == 'absent' and certificate_authority_exists:
 
             # The certificate authority should not exist, so delete it.
-            console.delete_ca(certificate_authority['id'])
+            if certificate_authority_corrupt:
+                console.delete_ext_ca(certificate_authority['id'])
+            else:
+                console.delete_ca(certificate_authority['id'])
             return module.exit_json(changed=True)
 
         elif state == 'absent':

plugins/modules/external_ordering_service.py

@@ -275,7 +275,7 @@ def main():
             has_deployment_attrs = False
             has_location = False
             for ordering_service_node in existing_ordering_service:
-                if not ordering_service_node.get('deployment_attrs_missing', False):
+                if 'deployment_attrs_missing' not in ordering_service_node:
                     has_deployment_attrs = True
                     break
                 elif ordering_service_node.get('location', '-') != '-':

plugins/modules/peer.py

@@ -504,7 +504,10 @@ def main():
         if state == 'absent' and peer_exists:
 
             # The peer should not exist, so delete it.
-            console.delete_peer(peer['id'])
+            if peer_corrupt:
+                console.delete_ext_peer(peer['id'])
+            else:
+                console.delete_peer(peer['id'])
             return module.exit_json(changed=True)
 
         elif state == 'absent':