summaryrefslogtreecommitdiff
path: root/cloudinit/sources/DataSourceCloudStack.py
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2013-03-20 08:30:43 -0400
committerScott Moser <smoser@ubuntu.com>2013-03-20 08:30:43 -0400
commitc49b92e2e1f32cbb32c856ba246ef97026318dbf (patch)
treea94d4ac07016710f7ab0723e240878b51c66bac6 /cloudinit/sources/DataSourceCloudStack.py
parent1c88411ed2692f2dacb0c6e15f27b8dca64e7089 (diff)
downloadvyos-cloud-init-c49b92e2e1f32cbb32c856ba246ef97026318dbf.tar.gz
vyos-cloud-init-c49b92e2e1f32cbb32c856ba246ef97026318dbf.zip
remove some churn
cloudinit/sources/DataSourceCloudStack.py and cloudinit/sources/DataSourceEc2.py are reverted entirely back to trunk versions now, rather than the non-behavior change that was left in place. Also, remove inadvertantly added trailing newline from cloudinit/ec2_utils.py Overall, this just makes the diff when merged to trunk carry more focused changes.
Diffstat (limited to 'cloudinit/sources/DataSourceCloudStack.py')
-rw-r--r--cloudinit/sources/DataSourceCloudStack.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/cloudinit/sources/DataSourceCloudStack.py b/cloudinit/sources/DataSourceCloudStack.py
index b4ca6d93..81c8cda9 100644
--- a/cloudinit/sources/DataSourceCloudStack.py
+++ b/cloudinit/sources/DataSourceCloudStack.py
@@ -25,7 +25,7 @@
import os
import time
-from cloudinit import ec2_utils
+from cloudinit import ec2_utils as ec2
from cloudinit import log as logging
from cloudinit import sources
from cloudinit import url_helper as uhelp
@@ -101,11 +101,10 @@ class DataSourceCloudStack(sources.DataSource):
if not self.wait_for_metadata_service():
return False
start_time = time.time()
- md_addr = self.metadata_address
- self.userdata_raw = ec2_utils.get_instance_userdata(self.api_ver,
- md_addr)
- self.metadata = ec2_utils.get_instance_metadata(self.api_ver,
- md_addr)
+ self.userdata_raw = ec2.get_instance_userdata(self.api_ver,
+ self.metadata_address)
+ self.metadata = ec2.get_instance_metadata(self.api_ver,
+ self.metadata_address)
LOG.debug("Crawl of metadata service took %s seconds",
int(time.time() - start_time))
return True