Merge lp:~andreserl/maas/packaging_bzr1948_ubuntu2 into lp:~maas-maintainers/maas/packaging

Proposed by Andres Rodriguez on 2014-02-15
Status: Merged
Approved by: Andres Rodriguez on 2014-02-15
Approved revision: 247
Merged at revision: 242
Proposed branch: lp:~andreserl/maas/packaging_bzr1948_ubuntu2
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 129 lines (+42/-21)
4 files modified
debian/changelog (+20/-2)
debian/maas-cluster-controller.maas-pserv.upstart (+1/-1)
debian/maas-cluster-controller.postinst (+15/-14)
debian/patches/02-pserv-config.patch (+6/-4)
To merge this branch: bzr merge lp:~andreserl/maas/packaging_bzr1948_ubuntu2
Reviewer Review Type Date Requested Status
Andres Rodriguez Approve on 2014-02-15
Review via email: mp+206596@code.launchpad.net

Commit message

Release 1.5+bzr1948-0ubuntu2
Open 1.5+bzr1948-0ubuntu3

To post a comment you must log in.
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 2014-02-13 19:17:14 +0000
3+++ debian/changelog 2014-02-15 21:26:52 +0000
4@@ -1,4 +1,21 @@
5-maas (1.5+bzr1930-0ubuntu1) UNRELEASED; urgency=low
6+maas (1.5+bzr1948-0ubuntu3) UNRELEASED; urgency=low
7+
8+ * UNRELEASED
9+
10+ -- Andres Rodriguez <andreserl@ubuntu.com> Sat, 15 Feb 2014 16:16:38 -0500
11+
12+maas (1.5+bzr1948-0ubuntu2) trusty; urgency=low
13+
14+ * debian/maas-cluster-controller.postinst: Make sure generator on
15+ pserv.yaml is updated on upgrade or reconfigure. (LP: #1273197)
16+ * debian/maas-cluster-controller.maas-pserv.upstart: Make sure maas-pserv
17+ is started with authbind.
18+
19+ -- Andres Rodriguez <andreserl@ubuntu.com> Sat, 15 Feb 2014 13:55:20 -0500
20+
21+maas (1.5+bzr1948-0ubuntu1) trusty; urgency=low
22+
23+ * New upstream release.
24
25 [ Graham Binns ]
26 * debian/control: Depends on python-jsonschema.
27@@ -6,6 +23,7 @@
28 [ Andres Rodriguez ]
29 * debian/maas-region-controller-min.posinst: Make txlongpoll.yaml only
30 readable by the app and not world readeable.
31+ * debian/patches/02-pserv-config.patch: Refreshed.
32
33 [ Julian Edwards ]
34 * debian/extras/maas-cli renamed to debian/extras/maas, and introduce
35@@ -23,7 +41,7 @@
36 * debian/maas-region-controller-min.postinst: Make sure txlongpoll.yaml
37 gets correct permissions on upgrade (LP: #1254034)
38
39- -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 13 Feb 2014 14:17:01 -0500
40+ -- Andres Rodriguez <andreserl@ubuntu.com> Sat, 15 Feb 2014 12:08:23 -0500
41
42 maas (1.5+bzr1909-0ubuntu1) trusty; urgency=low
43
44
45=== modified file 'debian/maas-cluster-controller.maas-pserv.upstart'
46--- debian/maas-cluster-controller.maas-pserv.upstart 2012-12-13 09:52:54 +0000
47+++ debian/maas-cluster-controller.maas-pserv.upstart 2014-02-15 21:26:52 +0000
48@@ -27,5 +27,5 @@
49 # file.
50 export CLUSTER_UUID
51 # To add options to your daemon, edit the line below:
52- exec /usr/bin/twistd -n --uid=maas --gid=maas --pidfile=/run/maas-pserv.pid --logfile=/dev/null maas-pserv --config-file=/etc/maas/pserv.yaml
53+ exec /usr/bin/authbind --deep /usr/bin/twistd -n --uid=maas --gid=maas --pidfile=/run/maas-pserv.pid --logfile=/dev/null maas-pserv --config-file=/etc/maas/pserv.yaml
54 end script
55
56=== modified file 'debian/maas-cluster-controller.postinst'
57--- debian/maas-cluster-controller.postinst 2013-12-05 17:43:07 +0000
58+++ debian/maas-cluster-controller.postinst 2014-02-15 21:26:52 +0000
59@@ -116,20 +116,7 @@
60 fi
61 }
62
63-
64-
65-if [ "$1" = "configure" ] && [ -z "$2" ]; then
66- # logging
67- create_log_dir
68- configure_maas_tgt
69-fi
70-
71-if ([ "$1" = "configure" ] && [ -z "$2" ]) || [ -n "$DEBCONF_RECONFIGURE" ]; then
72-
73- if dpkg --compare-versions "$2" lt 0.1+bzr1239+dfsg-0ubuntu1; then
74- create_log_dir
75- fi
76-
77+configure_pserv_generator(){
78 # Get the MAAS_URL on configure/reconfigure and write it to the conf files.
79 db_get maas-cluster-controller/maas-url || true
80 if [ -n "$RET" ]; then
81@@ -140,9 +127,23 @@
82 # line.
83 sed -ri "s|^([[:space:]]+)(#+[[:space:]]*)?(generator:[[:space:]]+https?://)[^:/]+|\1\3$HOSTPART|" /etc/maas/pserv.yaml
84 fi
85+}
86+
87+
88+
89+if [ "$1" = "configure" ] && [ -z "$2" ]; then
90+ # logging
91+ create_log_dir
92+ configure_maas_tgt
93 fi
94
95 if [ "$1" = "configure" ]; then
96+ if dpkg --compare-versions "$2" lt 0.1+bzr1239+dfsg-0ubuntu1; then
97+ create_log_dir
98+ fi
99+
100+ configure_pserv_generator
101+
102 # These config files may contain a private cluster UUID. Only maas
103 # can read them; only root can write them
104 chown root:maas \
105
106=== modified file 'debian/patches/02-pserv-config.patch'
107--- debian/patches/02-pserv-config.patch 2014-02-07 16:24:38 +0000
108+++ debian/patches/02-pserv-config.patch 2014-02-15 21:26:52 +0000
109@@ -3,8 +3,10 @@
110 include port, logfile, oops directory, cobbler url and username
111 Author: Andres Rodriguez <andreserl@ubuntu.com>
112
113---- maas-1.5+bzr1908.orig.orig/etc/maas/pserv.yaml 2014-02-07 11:21:21.686557887 -0500
114-+++ maas-1.5+bzr1908.orig/etc/maas/pserv.yaml 2014-02-07 11:21:21.678557887 -0500
115+Index: maas-1.5+bzr1948.orig/etc/maas/pserv.yaml
116+===================================================================
117+--- maas-1.5+bzr1948.orig.orig/etc/maas/pserv.yaml 2014-02-15 12:08:35.152998981 -0500
118++++ maas-1.5+bzr1948.orig/etc/maas/pserv.yaml 2014-02-15 12:08:35.148998981 -0500
119 @@ -6,7 +6,7 @@
120 ## running server.
121 #
122@@ -32,5 +34,5 @@
123 # generator: http://localhost/MAAS/api/1.0/pxeconfig/
124 - generator: http://localhost:5243/api/1.0/pxeconfig/
125
126- ## RPC configuration, for region<-->cluster communications.
127- #
128+ ## Boot configuration.
129+ boot:

Subscribers

People subscribed via source and target branches

to all changes: