From 1a209e6f83aa2d5e797d83dd9d22bc64fbaaeffc Mon Sep 17 00:00:00 2001 From: Vishvananda Ishaya Date: Sat, 5 Nov 2011 15:51:43 -0700 Subject: Refactor metadata code out of ec2/cloud.py part 2 of blueprint separate-nova-metadata Change-Id: Id41e48434ff3a38e524a1c64757a21bd461c06b8 --- nova/cloudpipe/pipelib.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'nova/cloudpipe') diff --git a/nova/cloudpipe/pipelib.py b/nova/cloudpipe/pipelib.py index 3eb372844..0e86f89b1 100644 --- a/nova/cloudpipe/pipelib.py +++ b/nova/cloudpipe/pipelib.py @@ -36,6 +36,7 @@ from nova import log as logging from nova import utils # TODO(eday): Eventually changes these to something not ec2-specific from nova.api.ec2 import cloud +from nova.api.ec2 import ec2utils FLAGS = flags.FLAGS @@ -98,7 +99,7 @@ class CloudPipe(object): key_name = self.setup_key_pair(ctxt) group_name = self.setup_security_group(ctxt) - ec2_id = self.controller.image_ec2_id(FLAGS.vpn_image_id) + ec2_id = ec2utils.image_ec2_id(FLAGS.vpn_image_id) reservation = self.controller.run_instances(ctxt, user_data=self.get_encoded_zip(project_id), max_count=1, -- cgit