Merge lp:~andreserl/maas/1.10_packaging_improvements into lp:~maas-maintainers/maas/packaging-1.10

Proposed by Andres Rodriguez on 2016-02-01
Status: Merged
Approved by: Andres Rodriguez on 2016-02-01
Approved revision: 442
Merged at revision: 442
Proposed branch: lp:~andreserl/maas/1.10_packaging_improvements
Merge into: lp:~maas-maintainers/maas/packaging-1.10
Diff against target: 65 lines (+15/-7)
3 files modified
debian/changelog (+11/-3)
debian/control (+3/-3)
debian/maas-region-controller.config (+1/-1)
To merge this branch: bzr merge lp:~andreserl/maas/1.10_packaging_improvements
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve on 2016-02-01
Review via email: mp+284645@code.launchpad.net

Commit message

* debian/maas-region-controller.config: Ensure we truly preseed db setting so we always use localhost and it never asks the user.
* debian/control: Suggests on python3-pyvmomi

To post a comment you must log in.
Andres Rodriguez (andreserl) wrote :

selfie!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2016-02-01 11:23:12 +0000
3+++ debian/changelog 2016-02-01 17:01:21 +0000
4@@ -1,6 +1,14 @@
5-maas (1.10.0+bzr4570-0ubuntu1) xenial; urgency=medium
6-
7- * New upstram release, 1.10.0 bzr 4570:
8+maas (1.10.0+bzr4572-0ubuntu2) xenial; urgency=medium
9+
10+ * debian/maas-region-controller.config: Ensure we truly preseed db
11+ setting so we always use localhost and it never asks the user.
12+ * debian/control: Suggests on python3-pyvmomi
13+
14+ -- Andres Rodriguez <andreserl@ubuntu.com> Mon, 01 Feb 2016 17:04:27 +0100
15+
16+maas (1.10.0+bzr4572-0ubuntu1) xenial; urgency=medium
17+
18+ * New upstram release, 1.10.0 bzr 4572:
19 - Support python3, drop support for python2.
20 - Support django 1.8+.
21 * debian/control:
22
23=== modified file 'debian/control'
24--- debian/control 2016-02-01 11:21:37 +0000
25+++ debian/control 2016-02-01 17:01:21 +0000
26@@ -51,7 +51,6 @@
27 Architecture: all
28 Depends: apache2,
29 bind9utils,
30- dbconfig-pgsql,
31 iproute,
32 libjs-angularjs,
33 libjs-yui3-full,
34@@ -78,7 +77,8 @@
35
36 Package: maas-region-controller
37 Architecture: all
38-Depends: maas-dns (= ${binary:Version}),
39+Depends: dbconfig-pgsql,
40+ maas-dns (= ${binary:Version}),
41 maas-region-controller-min (= ${binary:Version}),
42 postgresql (>= 9.1),
43 ${misc:Depends},
44@@ -172,7 +172,7 @@
45 wget,
46 ${misc:Depends},
47 ${python3:Depends}
48-Suggests: amtterm, ipmitool, libvirt-bin, python-pyvmomi
49+Suggests: amtterm, ipmitool, libvirt-bin, python3-pyvmomi
50 Conflicts: tftpd-hpa
51 Breaks: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ),
52 maas-region-controller ( <= 0.1+bzr1314+dfsg-0ubuntu1 ),
53
54=== modified file 'debian/maas-region-controller.config'
55--- debian/maas-region-controller.config 2016-01-28 04:22:01 +0000
56+++ debian/maas-region-controller.config 2016-02-01 17:01:21 +0000
57@@ -27,7 +27,7 @@
58 # Hide maas/dbconfig-install question by setting default.
59 set_question maas-region-controller/dbconfig-install true
60 set_question maas-region-controller/pgsql/app-pass ""
61- set_question maas-region-controller/remote/host ""
62+ set_question maas-region-controller/remote/host "localhost"
63
64 dbc_dbname="maasdb"
65 dbc_dbuser="maas"

Subscribers

People subscribed via source and target branches