Merge lp:~javier.collado/utah/bug1047356 into lp:utah

Proposed by Javier Collado
Status: Merged
Merged at revision: 674
Proposed branch: lp:~javier.collado/utah/bug1047356
Merge into: lp:utah
Diff against target: 35 lines (+7/-6)
1 file modified
debian/control (+7/-6)
To merge this branch: bzr merge lp:~javier.collado/utah/bug1047356
Reviewer Review Type Date Requested Status
Max Brustkern (community) Approve
Review via email: mp+124166@code.launchpad.net

Description of the change

This branch adds cobbler as a recommended package.

If cobbler isn't installed, then the utah server should report an error if an attempt to provision a physical machine is made. However, that will be addressed in a separate bug.

Note: This branch has been on created on top of lp:~javier.collado/utah/bug1050262 to avoid merge conflicts later. However, this means that it should be merged only after that branch.

To post a comment you must log in.
Revision history for this message
Max Brustkern (nuclearbob) wrote :

I've been meaning to do this. Thanks for taking care of it.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2012-08-14 16:55:16 +0000
3+++ debian/control 2012-09-13 11:44:23 +0000
4@@ -3,7 +3,7 @@
5 X-Python-Version: >= 2.5
6 Priority: optional
7 Maintainer: Max Brustkern <max@canonical.com>
8-Build-Depends: debhelper (>= 7.0.50~), python-all, devscripts
9+Build-Depends: debhelper (>= 7.0.50~), devscripts, python-all
10 Standards-Version: 3.9.3
11 Homepage: https://code.launchpad.net/utah
12 Vcs-Bzr: https://code.launchpad.net/utah
13@@ -11,16 +11,17 @@
14 Package: utah
15 Architecture: all
16 Depends: ${misc:Depends}, ${python:Depends},
17- bzr, bsdtar, git, libvirt-bin, lzma,
18- python-apt, python-libvirt, python-jsonschema,
19- python-netifaces, python-paramiko, python-psutil, python-yaml,
20+ bsdtar, libvirt-bin, lzma,
21+ python-apt, python-libvirt,
22+ python-netifaces, python-paramiko, python-psutil,
23 utah-client (=${binary:Version})
24-Recommends: kvm, vm-tools
25+Recommends: cobbler, kvm, vm-tools
26 Description: Ubuntu Test Automation Harness
27 Automation framework for testing in Ubuntu
28
29 Package: utah-client
30 Architecture: all
31-Depends: ${misc:Depends}, ${python:Depends}, python-jsonschema, python-yaml, bzr, git
32+Depends: ${misc:Depends}, ${python:Depends},
33+ bzr, git, python-jsonschema (>= 0.5~), python-yaml
34 Description: Ubuntu Test Automation Harness Client
35 Automation framework for testing in Ubuntu, client portion

Subscribers

People subscribed via source and target branches