summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Harlow <harlowja@yahoo-inc.com>2012-10-24 20:37:12 -0700
committerJoshua Harlow <harlowja@yahoo-inc.com>2012-10-24 20:37:12 -0700
commitec28772204c9b262e34cc7837e3baac0dac5ec5e (patch)
tree24fcdb3e6b8a2d536fb794f4a729150cffa83613
parent8ffc2c8f791b7694a121ec30dac7437c6e8fdb9b (diff)
downloadvyos-cloud-init-ec28772204c9b262e34cc7837e3baac0dac5ec5e.tar.gz
vyos-cloud-init-ec28772204c9b262e34cc7837e3baac0dac5ec5e.zip
Move the comment to the top + mark as fixing.
LP: #1068801
-rw-r--r--cloudinit/ec2_utils.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/cloudinit/ec2_utils.py b/cloudinit/ec2_utils.py
index 76699102..06b302f2 100644
--- a/cloudinit/ec2_utils.py
+++ b/cloudinit/ec2_utils.py
@@ -24,6 +24,14 @@ import cloudinit.url_helper as uh
import boto.utils as boto_utils
+# Versions of boto >= 2.6.0 try to lazily load
+# the metadata backing, which doesn't work so well
+# in cloud-init especially since the metadata is
+# serialized and actions are performed where the
+# metadata server may be blocked (thus the datasource
+# will start failing) resulting in url exceptions
+# when fields that do exist (or would have existed)
+# do not exist due to the blocking that occurred.
BOTO_LAZY = False
try:
@@ -34,14 +42,6 @@ except pkg_resources.DistributionNotFound:
pass
-# Versions of boto >= 2.6.0 try to lazily load
-# the metadata backing, which doesn't work so well
-# in cloud-init especially since the metadata is
-# serialized and actions are performed where the
-# metadata server may be blocked (thus the datasource
-# will start failing) resulting in url exceptions
-# when fields that do exist (or would have existed)
-# do not exist due to the blocking that occurred.
def _unlazy_dict(mp):
if not isinstance(mp, (dict)):
return mp