← Back to branch summary

~andreserl/+junk/ensemble

~andreserl/+junk/ensemble

« back to all changes in this revision

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

Committer: William Reade
Date: 2011-08-03 14:24:44 UTC
mfrom: (281.1.25 cobbler-launch-machine)
Revision ID: fwereade@gmail.com-20110803142444-tqy7c9nuywfvtpdm

merge from lp:~fwereade/ensemble/cobbler-launch-macine

files added:
ensemble/providers/common/findzookeepers.py

ensemble/providers/common/tests/test_findzookeepers.py

ensemble/providers/orchestra/tests/test_machine.py

files modified:
ensemble/control/status.py

ensemble/control/tests/test_status.py

ensemble/errors.py

ensemble/providers/dummy.py

ensemble/providers/ec2/__init__.py

ensemble/providers/ec2/findzookeepers.py

ensemble/providers/ec2/machine.py

ensemble/providers/ec2/tests/test_findzookeeper.py

ensemble/providers/orchestra/__init__.py

ensemble/providers/orchestra/cobbler.py

ensemble/providers/orchestra/findzookeepers.py

ensemble/state/tests/test_utils.py

Show diffs side-by-side

added added

removed removed

ensemble/providers/ec2/machine.py

2

2

3

3

from ensemble.machine import ProviderMachine

4

4

5

from .utils import log

6

7

5

8

6

class EC2ProviderMachine(ProviderMachine):

9

7

"""EC2-specific ProviderMachine implementation.

Older »