← Back to branch summary

~rlane/nova/lp773690

« back to all changes in this revision

Viewing changes to nova/cloudpipe/pipelib.py

  • Committer: rlane at wikimedia
  • Date: 2011-04-29 22:30:40 UTC
  • mfrom: (382.1.655 nova)
  • Revision ID: rlane@wikimedia.org-20110429223040-i0x3ds9eqwrabyru
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/cloudpipe/pipelib.py
101
101
        key_name = self.setup_key_pair(ctxt)
102
102
        group_name = self.setup_security_group(ctxt)
103
103
 
 
104
        ec2_id = self.controller.image_ec2_id(FLAGS.vpn_image_id)
104
105
        reservation = self.controller.run_instances(ctxt,
105
106
            user_data=self.get_encoded_zip(project_id),
106
107
            max_count=1,
107
108
            min_count=1,
108
109
            instance_type='m1.tiny',
109
 
            image_id=FLAGS.vpn_image_id,
 
110
            image_id=ec2_id,
110
111
            key_name=key_name,
111
112
            security_group=[group_name])
112
113