diff options
| author | Dan Prince <dan.prince@rackspace.com> | 2011-05-26 09:05:14 -0400 |
|---|---|---|
| committer | Dan Prince <dan.prince@rackspace.com> | 2011-05-26 09:05:14 -0400 |
| commit | a021b43b7d45f8cc803721002a0b2e7d9ea9a06d (patch) | |
| tree | 6c3f6274d91a511a04a322a46d8678f4ad18d71a /nova/cloudpipe | |
| parent | 9d2513ea3a6d586e1fe3deae778a02bb089b9a5e (diff) | |
| parent | db18a792414240cbdb1221d0e79e8a63313f103e (diff) | |
Merge w/ trunk.
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 dc6f55af2..7844d31e1 100644 --- a/nova/cloudpipe/pipelib.py +++ b/nova/cloudpipe/pipelib.py @@ -101,12 +101,13 @@ 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) reservation = self.controller.run_instances(ctxt, user_data=self.get_encoded_zip(project_id), max_count=1, min_count=1, instance_type='m1.tiny', - image_id=FLAGS.vpn_image_id, + image_id=ec2_id, key_name=key_name, security_group=[group_name]) |