summaryrefslogtreecommitdiff
path: root/ec2init
diff options
context:
space:
mode:
authorScott Moser <smoser@nelson>2010-01-08 16:17:42 -0500
committerScott Moser <smoser@nelson>2010-01-08 16:17:42 -0500
commit57ed1d5417e0ea415a55dd2619dda83abb4cbc87 (patch)
tree2cc5cc0756cfb7efbd5a4346b6aeacec969a63ea /ec2init
parenta6581a3775bc63ef6dcf9523b3952f79998ab9c6 (diff)
downloadvyos-cloud-init-57ed1d5417e0ea415a55dd2619dda83abb4cbc87.tar.gz
vyos-cloud-init-57ed1d5417e0ea415a55dd2619dda83abb4cbc87.zip
change DataSourceEc2 to use the local boto_utils
Diffstat (limited to 'ec2init')
-rw-r--r--ec2init/DataSourceEc2.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/ec2init/DataSourceEc2.py b/ec2init/DataSourceEc2.py
index 060d5146..84f2f71c 100644
--- a/ec2init/DataSourceEc2.py
+++ b/ec2init/DataSourceEc2.py
@@ -1,11 +1,11 @@
import DataSource
import ec2init
-import boto.utils
import socket
import urllib2
import time
import cPickle
+import boto_utils
class DataSourceEc2(DataSource.DataSource):
api_ver = '2009-04-04'
@@ -37,8 +37,8 @@ class DataSourceEc2(DataSource.DataSource):
try:
if not self.wait_for_metadata_service():
return False
- self.userdata_raw = boto.utils.get_instance_userdata(self.api_ver)
- self.metadata = boto.utils.get_instance_metadata(self.api_ver)
+ self.userdata_raw = boto_utils.get_instance_userdata(self.api_ver)
+ self.metadata = boto_utils.get_instance_metadata(self.api_ver)
return True
except Exception as e:
print e