diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-04-22 04:31:24 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-04-22 04:31:24 +0000 |
| commit | 32bb38fad4bd86406d714827743fbfe2e134f53d (patch) | |
| tree | 69345f9bcd3a6a6052accdd7ee276f3d51289dde /nova/cloudpipe | |
| parent | 659ae2ce4685034f9979702ca92a361acc23b1b6 (diff) | |
| parent | b8683f5d0e9b903f3c7864f5dffe536d6e8ccea3 (diff) | |
Fixes cloudpipe to get the proper ip address.
* Changes FLAGS.vpn_image_id to integer
* Converts to str when comparing because instance['image_id'] is a str
* Removes unused method from db
* Converts integer_id to ami when launching
* Adds docs for setting up interface in cloudpipe image
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]) |