diff options
| author | Brian Waldon <brian.waldon@rackspace.com> | 2011-04-22 15:44:24 -0400 |
|---|---|---|
| committer | Brian Waldon <brian.waldon@rackspace.com> | 2011-04-22 15:44:24 -0400 |
| commit | 95ea08d252b63c9721c79c58785e1a1df98cc3a6 (patch) | |
| tree | a886e05be22f7bcd128bd7f581dc07f24a72faf2 /nova/cloudpipe | |
| parent | 8681db3aa9104f97a84a3323b102ed10af269888 (diff) | |
| parent | 7e01d47e887fe96b997ba16013022112d71ea62a (diff) | |
merging 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]) |