diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-11-05 15:51:43 -0700 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-11-17 11:10:30 -0800 |
| commit | 1a209e6f83aa2d5e797d83dd9d22bc64fbaaeffc (patch) | |
| tree | b7f454b2fcb8e3cc3b593c95ba3b082a2aa11fff /nova/cloudpipe | |
| parent | de635fc882caebd5d5c9701e755a7174e37a05c5 (diff) | |
| download | nova-1a209e6f83aa2d5e797d83dd9d22bc64fbaaeffc.tar.gz nova-1a209e6f83aa2d5e797d83dd9d22bc64fbaaeffc.tar.xz nova-1a209e6f83aa2d5e797d83dd9d22bc64fbaaeffc.zip | |
Refactor metadata code out of ec2/cloud.py
part 2 of blueprint separate-nova-metadata
Change-Id: Id41e48434ff3a38e524a1c64757a21bd461c06b8
Diffstat (limited to 'nova/cloudpipe')
| -rw-r--r-- | nova/cloudpipe/pipelib.py | 3 |
1 files changed, 2 insertions, 1 deletions
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, |