diff options
| author | Cerberus <matt.dietz@rackspace.com> | 2011-04-22 10:39:35 -0500 |
|---|---|---|
| committer | Cerberus <matt.dietz@rackspace.com> | 2011-04-22 10:39:35 -0500 |
| commit | c03e9805328afe1d03fa65ac93d2b91ba04c229e (patch) | |
| tree | 7234fe551b9f6e32b80e91753dbf91a2181d4b9a /nova/cloudpipe | |
| parent | 14718afef1cc79b4d41f490be677caf3e4191e2b (diff) | |
| parent | 8af2a2d720b97ef17565d57a9b8b028d449a9c84 (diff) | |
Merge from 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]) |