← Back to branch summary

~lifeless/pyjuju/lxc

« back to all changes in this revision

Viewing changes to ensemble/providers/ec2/launch.py

  • Committer: Clint Byrum
  • Date: 2011-06-25 17:41:31 UTC
  • Revision ID: clint@ubuntu.com-20110625174131-ed66b6ydcw1rc8tj
fixing branch config tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
ensemble/providers/ec2/launch.py
1
1
from twisted.internet.defer import inlineCallbacks, returnValue, fail
2
2
from ensemble.providers import common
3
3
from ensemble.errors import EnvironmentNotFound, ProviderError
 
4
import subprocess
4
5
 
5
6
from .machine import EC2ProviderMachine
6
7
from .connect import EC2ZookeeperAware
149
150
        machine_data["provider"] = 'ec2'
150
151
 
151
152
        variables = self.get_machine_variables(machine_data)
152
 
        # EC2 has a branch on the AMI
153
 
        update_scripts = common.get_update_scripts(self.config)
154
 
        update_scripts.extend(variables['scripts'])
155
 
        variables['scripts'] = update_scripts
156
153
 
157
154
        # Retrieves standard ec2 run_instances arguments, of note
158
155
        # image id, and instance type.
180
177
        returnValue(hosts)
181
178
 
182
179
    def get_machine_variables(self, machine_data):
183
 
        return common.get_machine_variables(self.config, machine_data)
 
180
        # EC2 has a branch on the AMI
 
181
        variables = common.get_machine_variables(self.config, machine_data)
 
182
        update_scripts = common.get_update_scripts(self.config, machine_data)
 
183
        update_scripts.extend(variables['scripts'])
 
184
        variables['scripts'] = update_scripts
 
185
        return variables
184
186
 
185
187
 
186
188
class EC2Bootstrap(EC2LaunchMachine):