Merge pull request #5829 from Fale/fix_main_cloud_amazon

Call main in conditional way - cloud/amazon

14 files changed, 28 insertions, 14 deletions

diff --git a/cloud/amazon/ec2.py b/cloud/amazon/ec2.py
index 8e17b920..3ca9bf37 100644
--- a/cloud/amazon/ec2.py
+++ b/cloud/amazon/ec2.py
@@ -1624,4 +1624,5 @@ def main():
 from ansible.module_utils.basic import *
 from ansible.module_utils.ec2 import *
 
-main()
+if __name__ == '__main__':
+    main()
diff --git a/cloud/amazon/ec2_facts.py b/cloud/amazon/ec2_facts.py
index f7fb86cb..7522658c 100644
--- a/cloud/amazon/ec2_facts.py
+++ b/cloud/amazon/ec2_facts.py
@@ -183,4 +183,5 @@ def main():
 from ansible.module_utils.basic import *
 from ansible.module_utils.urls import *
 
-main()
+if __name__ == '__main__':
+    main()
diff --git a/cloud/amazon/ec2_group.py b/cloud/amazon/ec2_group.py
index 919edfae..4e320d12 100644
--- a/cloud/amazon/ec2_group.py
+++ b/cloud/amazon/ec2_group.py
@@ -475,4 +475,5 @@ def main():
 from ansible.module_utils.basic import *
 from ansible.module_utils.ec2 import *
 
-main()
+if __name__ == '__main__':
+    main()
diff --git a/cloud/amazon/ec2_key.py b/cloud/amazon/ec2_key.py
index d0f361e3..5adb2e95 100644
--- a/cloud/amazon/ec2_key.py
+++ b/cloud/amazon/ec2_key.py
@@ -241,4 +241,5 @@ def main():
 from ansible.module_utils.basic import *
 from ansible.module_utils.ec2 import *
 
-main()
+if __name__ == '__main__':
+    main()
diff --git a/cloud/amazon/ec2_lc.py b/cloud/amazon/ec2_lc.py
index d36bb15e..97c95926 100644
--- a/cloud/amazon/ec2_lc.py
+++ b/cloud/amazon/ec2_lc.py
@@ -308,4 +308,5 @@ def main():
     elif state == 'absent':
         delete_launch_config(connection, module)
 
-main()
+if __name__ == '__main__':
+    main()
diff --git a/cloud/amazon/ec2_vpc.py b/cloud/amazon/ec2_vpc.py
index e17674e2..4ae2065b 100644
--- a/cloud/amazon/ec2_vpc.py
+++ b/cloud/amazon/ec2_vpc.py
@@ -742,4 +742,5 @@ def main():
 from ansible.module_utils.basic import *
 from ansible.module_utils.ec2 import *
 
-main()
+if __name__ == '__main__':
+    main()
diff --git a/cloud/amazon/elasticache.py b/cloud/amazon/elasticache.py
index 5a3a60c0..b0457ace 100644
--- a/cloud/amazon/elasticache.py
+++ b/cloud/amazon/elasticache.py
@@ -554,4 +554,5 @@ def main():
 from ansible.module_utils.basic import *
 from ansible.module_utils.ec2 import *
 
-main()
+if __name__ == '__main__':
+    main()
diff --git a/cloud/amazon/elasticache_subnet_group.py b/cloud/amazon/elasticache_subnet_group.py
index f2aa2e25..7fbdfec9 100644
--- a/cloud/amazon/elasticache_subnet_group.py
+++ b/cloud/amazon/elasticache_subnet_group.py
@@ -151,4 +151,5 @@ def main():
 from ansible.module_utils.basic import *
 from ansible.module_utils.ec2 import *
 
-main()
+if __name__ == '__main__':
+    main()
diff --git a/cloud/amazon/iam.py b/cloud/amazon/iam.py
index 15f6741b..8c10bd09 100644
--- a/cloud/amazon/iam.py
+++ b/cloud/amazon/iam.py
@@ -795,4 +795,5 @@ def main():
 from ansible.module_utils.basic import *
 from ansible.module_utils.ec2 import *
 
-main()
+if __name__ == '__main__':
+    main()
diff --git a/cloud/amazon/iam_policy.py b/cloud/amazon/iam_policy.py
index a95f88f4..5391294b 100644
--- a/cloud/amazon/iam_policy.py
+++ b/cloud/amazon/iam_policy.py
@@ -349,4 +349,5 @@ def main():
 from ansible.module_utils.basic import *
 from ansible.module_utils.ec2 import *
 
-main()
+if __name__ == '__main__':
+    main()
diff --git a/cloud/amazon/rds.py b/cloud/amazon/rds.py
index 5b2e4383..1e33f9c4 100644
--- a/cloud/amazon/rds.py
+++ b/cloud/amazon/rds.py
@@ -1104,4 +1104,5 @@ def main():
 from ansible.module_utils.basic import *
 from ansible.module_utils.ec2 import *
 
-main()
+if __name__ == '__main__':
+    main()
diff --git a/cloud/amazon/rds_subnet_group.py b/cloud/amazon/rds_subnet_group.py
index 7ec4ac01..e99b3d8d 100644
--- a/cloud/amazon/rds_subnet_group.py
+++ b/cloud/amazon/rds_subnet_group.py
@@ -151,4 +151,5 @@ def main():
 from ansible.module_utils.basic import *
 from ansible.module_utils.ec2 import *
 
-main()
+if __name__ == '__main__':
+    main()
diff --git a/cloud/amazon/route53.py b/cloud/amazon/route53.py
index 4f08a4f6..9c0f19bf 100644
--- a/cloud/amazon/route53.py
+++ b/cloud/amazon/route53.py
@@ -586,4 +586,5 @@ def main():
 from ansible.module_utils.basic import *
 from ansible.module_utils.ec2 import *
 
-main()
+if __name__ == '__main__':
+    main()
diff --git a/cloud/amazon/s3.py b/cloud/amazon/s3.py
index fad1d6d6..d2b4912f 100755
--- a/cloud/amazon/s3.py
+++ b/cloud/amazon/s3.py
@@ -736,4 +736,5 @@ def main():
 from ansible.module_utils.basic import *
 from ansible.module_utils.ec2 import *
 
-main()
+if __name__ == '__main__':
+    main()