~ubuntu-branches/ubuntu/trusty/juju/trusty

« back to all changes in this revision

Viewing changes to juju/providers/common/cloudinit.py

  • Committer: Clint Byrum
  • Date: 2012-01-23 18:16:35 UTC
  • mfrom: (1.1.4)
  • Revision ID: clint@ubuntu.com-20120123181635-epogr1dvjmk53l0h
* New upstream snapshot.
  - Fixed regression with twisted 11.1 (LP: #917954)

Show diffs side-by-side

added added

removed removed

Lines of Context:
275
275
    def _collect_packages(self):
276
276
        packages = [
277
277
            "bzr", "byobu", "tmux", "python-setuptools", "python-twisted",
278
 
            "python-argparse", "python-txaws", "python-zookeeper"]
 
278
            "python-txaws", "python-zookeeper"]
279
279
        if self._zookeeper:
280
280
            packages.extend([
281
281
                "default-jre-headless", "zookeeper", "zookeeperd"])