diff options
| author | Eldar Nugaev <enugaev@griddynamics.com> | 2011-04-27 00:51:51 -0700 |
|---|---|---|
| committer | Eldar Nugaev <enugaev@griddynamics.com> | 2011-04-27 00:51:51 -0700 |
| commit | 4695b46d6bee3f6993b95c88c0df3f324a76bfc1 (patch) | |
| tree | 9e33d8e9d29520bece80a335055caedf23b8be68 /nova/cloudpipe | |
| parent | a4b78306d31e1ef84d5dc9550ef2dcb1ed030fa2 (diff) | |
| parent | 26d44d12b3dee219002c11d78e3a7bb26fbff62a (diff) | |
merge with trunk and resolve conflicts
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]) |