Merge remote-tracking branch 'origin/feature/report_exporters' into feature/report_exporters

2018-11-27 14:45:12 +02:00 · 2018-11-27 14:45:12 +02:00 · 7f8a00ddc1
parent bf29cddf4d 673605b721
commit 7f8a00ddc1
1 changed files with 4 additions and 0 deletions
--- a/monkey/monkey_island/cc/environment/aws.py
+++ b/monkey/monkey_island/cc/environment/aws.py
@ -18,6 +18,10 @@ class AwsEnvironment(Environment):
    def _get_region(self):
        return self.aws_info.get_region()

+    @staticmethod
+    def _get_region():
+        return urllib2.urlopen('http://169.254.169.254/latest/meta-data/placement/availability-zone').read()[:-1]
+
    def is_auth_enabled(self):
        return True