Merge lp:~andreserl/maas/packaging.raring-updates into lp:~maas-maintainers/maas/packaging.quantal

Proposed by Andres Rodriguez
Status: Superseded
Proposed branch: lp:~andreserl/maas/packaging.raring-updates
Merge into: lp:~maas-maintainers/maas/packaging.quantal
Diff against target: 257 lines (+62/-41)
11 files modified
debian/changelog (+27/-0)
debian/control (+3/-4)
debian/extras/99-maas (+1/-4)
debian/extras/99-maas-sudoers (+1/-0)
debian/maas-cluster-controller.config (+5/-0)
debian/maas-cluster-controller.install (+9/-0)
debian/maas-cluster-controller.postinst (+11/-0)
debian/maas-cluster-controller.postrm (+5/-0)
debian/maas-region-controller.install (+0/-15)
debian/maas-region-controller.postinst (+0/-13)
debian/maas-region-controller.postrm (+0/-5)
To merge this branch: bzr merge lp:~andreserl/maas/packaging.raring-updates
Reviewer Review Type Date Requested Status
MAAS Maintainers Pending
Review via email: mp+134198@code.launchpad.net

This proposal has been superseded by a proposal from 2012-11-13.

To post a comment you must log in.

Unmerged revisions

147. By Andres Rodriguez

debian/maas-cluster-controller.config: If URL has been detected, add /MAAS if
it doesn't contain it. This helps upgrades from versions where DEFAULT_MAAS_URL
didn't use /MAAS.

146. By Andres Rodriguez

* debian/control:
  - maas-cluster-controller Conflicts with tftpd-hpa (LP: #1076028)
  - maas-dns: Conflicts with dnsmasq

145. By Gavin Panella

[r=andreserl][bug=1074167,1076409,1077180][author=allenap] Remove all install-via-squashfs support.

144. By Jeroen T. Vermeulen

[r=andreserl][bug=][author=jtv] Move the import scripts from the region-controller package to the cluster-controller package.

143. By Raphaël Badin

[r=jtv][bug=][author=rvb] Add sudo rule so that the script maas-import-pxe-files can be called by the user 'maas'.

142. By Raphaël Badin

[r=andreserl][bug=1072744][author=rvb] * debian/control: Remove the dependency of maas-cluster-controller on rabbitmq-server.

141. By Julian Edwards

[r=julian-edwards][bug=1052805][author=julian-edwards] [ Julian Edwards ]
  * debian/maas-region-controller.install: Remove installation of maas-gc; it
    is no longer required as upstream no longer stores files in the filesystem.
    (LP: #1069734)

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 2012-10-26 10:51:16 +0000
3+++ debian/changelog 2012-11-13 20:47:22 +0000
4@@ -3,12 +3,39 @@
5 [ Raphaël Badin ]
6 * debian/maas-dns.postinst: fix permissions and group ownership of
7 file /etc/bind/maas/named.conf.rndc.maas. (LP: #1066935)
8+ * debian/control: Remove the dependency of maas-cluster-controller
9+ on rabbitmq-server. (LP: #1072744)
10+ * debian/extras/99-maas-sudoers: Add sudo rule for script
11+ /usr/sbin/maas-import-pxe-files.
12
13 [ Julian Edwards ]
14 * debian/maas-region-controller.install: Remove installation of maas-gc; it
15 is no longer required as upstream no longer stores files in the filesystem.
16 (LP: #1069734)
17
18+ [ Jeroen Vermeulen ]
19+ * debian/maas-cluster-controller.install: Install import scripts.
20+ * debian/maas-cluster-controller.postinst: Configure tgt (the iSCSI server)
21+ so the import script can install files to it.
22+ * debian/maas-cluster-controller.postrm: Clean up tgt config.
23+ * debian/maas-region-controller.install: Move import scripts out to the
24+ cluster controller, and drop the maas-import-isos compatibility script.
25+ * debian/maas-region-controller.postinst: Remove tgt config.
26+ * debian/maas-region-controller.postrm: Remove tgt config cleanup.
27+
28+ [ Gavin Panella ]
29+ * debian/extras/99-maas: squashfs image download is no longer needed.
30+ * debian/maas-cluster-controller.install: maas-import-squashfs and its
31+ configuration file are no longer part of upstream.
32+
33+ [ Andres Rodriguez ]
34+ * debian/control:
35+ - maas-cluster-controller Conflicts with tftpd-hpa (LP: #1076028)
36+ - maas-dns: Conflicts with dnsmasq
37+ * debian/maas-cluster-controller.config: If URL has been detected, add /MAAS if
38+ it doesn't contain it. This helps upgrades from versions where DEFAULT_MAAS_URL
39+ didn't use /MAAS.
40+
41 -- Julian Edwards <julian.edwards@canonical.com> Fri, 26 Oct 2012 12:50:20 +0200
42
43 maas (0.1+bzr1269+dfsg-0ubuntu1) quantal-proposed; urgency=low
44
45=== modified file 'debian/control'
46--- debian/control 2012-10-16 14:30:48 +0000
47+++ debian/control 2012-11-13 20:47:22 +0000
48@@ -17,7 +17,7 @@
49 Architecture: all
50 Pre-Depends: ${misc:Pre-Depends}
51 Depends: maas-cluster-controller, maas-region-controller, python-django-maas
52-Conflicts: dnsmasq, maas-provision, tftpd-hpa
53+Conflicts: maas-provision
54 Replaces: maas-provision
55 Description: Ubuntu MAAS Server
56 Ubuntu MAAS Server is the successor to Orchestra. It offers a
57@@ -176,7 +176,6 @@
58 python-tempita,
59 python-twisted,
60 python-zope.interface,
61- rabbitmq-server,
62 rsyslog,
63 syslinux-common,
64 tgt,
65@@ -185,7 +184,7 @@
66 ${misc:Depends},
67 ${python:Depends}
68 Suggests: maas-dhcp (= ${binary:Version})
69-Conflicts: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
70+Conflicts: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), tftpd-hpa
71 Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
72 Description: Ubuntu MAAS Cluster Controller
73 Ubuntu MAAS Server is the successor to Orchestra. It offers a
74@@ -261,7 +260,7 @@
75 maas-region-controller (= ${binary:Version}),
76 maas-dhcp (= ${binary:Version}),
77 ${misc:Depends}
78-Conflicts: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
79+Conflicts: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1), dnsmasq
80 Replaces: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
81 Description: Ubuntu MAAS Server - DNS configuration (metapackage)
82 Ubuntu MAAS Server is the successor to Orchestra. It offers a
83
84=== modified file 'debian/extras/99-maas'
85--- debian/extras/99-maas 2012-10-04 18:52:27 +0000
86+++ debian/extras/99-maas 2012-11-13 20:47:22 +0000
87@@ -1,7 +1,4 @@
88 # /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas
89-#
90+#
91 # Enable launchpad personal package archives for squid-deb-proxy
92 ppa.launchpad.net
93-# Enable access to MAAS server HTTP to allow squashfs download
94-# during install
95-maas.internal.example.com # maasurl
96
97=== modified file 'debian/extras/99-maas-sudoers'
98--- debian/extras/99-maas-sudoers 2012-09-25 23:18:02 +0000
99+++ debian/extras/99-maas-sudoers 2012-11-13 20:47:22 +0000
100@@ -1,2 +1,3 @@
101 maas ALL= NOPASSWD: /usr/sbin/service maas-dhcp-server restart
102 maas ALL= NOPASSWD: /usr/sbin/maas-provision
103+maas ALL= NOPASSWD: /usr/sbin/maas-import-pxe-files
104
105=== modified file 'debian/maas-cluster-controller.config'
106--- debian/maas-cluster-controller.config 2012-10-08 17:16:30 +0000
107+++ debian/maas-cluster-controller.config 2012-11-13 20:47:22 +0000
108@@ -14,6 +14,11 @@
109 # Attempt to pre-populate if installing on the region controller.
110 if [ -e /etc/maas/maas_local_settings.py ]; then
111 url=$(awk '$1 == "DEFAULT_MAAS_URL" { split($0,array,"\"")} END{print array[2] }' /etc/maas/maas_local_settings.py)
112+ # If the URL doesn't end in /MAAS then add it. This helps upgrades from
113+ # precise for which the URL didn't contain /MAAS, which is now required
114+ if ! echo $url | grep -qs "/MAAS$"; then
115+ url="${url}/MAAS"
116+ fi
117 db_set maas-cluster-controller/maas-url "$url"
118 else
119 # Will only get here if dbconf value not already set, or
120
121=== modified file 'debian/maas-cluster-controller.install'
122--- debian/maas-cluster-controller.install 2012-10-10 19:06:52 +0000
123+++ debian/maas-cluster-controller.install 2012-11-13 20:47:22 +0000
124@@ -13,6 +13,15 @@
125 # Install local celery cluster config file
126 debian/tmp/etc/maas/maas_local_celeryconfig_cluster.py
127
128+# Install maas-import-pxe-files and related files
129+debian/tmp/usr/sbin/maas-import-pxe-files
130+etc/cron.d/maas-import-pxe-files
131+man/maas-import-pxe-files.8 usr/share/man/man8
132+debian/tmp/etc/maas/import_pxe_files
133+debian/tmp/usr/sbin/maas-import-ephemerals
134+debian/tmp/etc/maas/import_ephemerals
135+debian/tmp/etc/maas/commissioning-user-data
136+
137 # Install all other stuff
138 debian/extras/99-maas-sudoers etc/sudoers.d
139 debian/extras/isc-dhcp-server.override etc/init
140
141=== modified file 'debian/maas-cluster-controller.postinst'
142--- debian/maas-cluster-controller.postinst 2012-10-11 18:16:28 +0000
143+++ debian/maas-cluster-controller.postinst 2012-11-13 20:47:22 +0000
144@@ -17,6 +17,15 @@
145 chmod -R 775 /var/log/maas/oops
146 }
147
148+configure_maas_tgt(){
149+ # Set up iSCSI: add maas.conf to tgt conf.d.
150+ local tgtcfg="/etc/tgt/targets.conf"
151+ [ -d /etc/tgt/conf.d/ ] ||
152+ echo "Warning! $tgtcfg did not exist" 1>&2;
153+ mkdir -p /etc/tgt/conf.d/ /var/lib/maas/ephemeral/
154+ ln -sf /var/lib/maas/ephemeral/tgt.conf /etc/tgt/conf.d/maas.conf
155+}
156+
157 if [ "$1" = "configure" ] && [ -z "$2" ]; then
158 # logging
159 create_log_dir
160@@ -32,6 +41,8 @@
161 sed -i "s|^CLUSTER_UUID\ \= None$|CLUSTER_UUID = '"$uuid"'|" \
162 /etc/maas/maas_local_celeryconfig_cluster.py
163 fi
164+
165+ configure_maas_tgt
166 fi
167
168 if ([ "$1" = "configure" ] && [ -z "$2" ]) || [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
169
170=== modified file 'debian/maas-cluster-controller.postrm'
171--- debian/maas-cluster-controller.postrm 2012-10-11 18:16:28 +0000
172+++ debian/maas-cluster-controller.postrm 2012-11-13 20:47:22 +0000
173@@ -18,6 +18,11 @@
174 rm -rf /var/lib/maas
175 fi
176
177+ # Delete symlink for iSCSI config.
178+ if [ -L /etc/tgt/conf.d/maas.conf ]; then
179+ rm -rf /etc/tgt/conf.d/maas.conf
180+ fi
181+
182 esac
183
184 #DEBHELPER#
185
186=== modified file 'debian/maas-region-controller.install'
187--- debian/maas-region-controller.install 2012-10-26 10:51:16 +0000
188+++ debian/maas-region-controller.install 2012-11-13 20:47:22 +0000
189@@ -22,21 +22,6 @@
190 # Install txlongpoll config file
191 debian/tmp/etc/maas/txlongpoll.yaml
192
193-# Install maas-import-pxe-files
194-debian/tmp/usr/sbin/maas-import-pxe-files
195-
196-# Install maas-import-pxe-files and related files
197-etc/cron.d/maas-import-pxe-files
198-man/maas-import-pxe-files.8 usr/share/man/man8
199-debian/tmp/etc/maas/import_pxe_files
200-debian/tmp/usr/sbin/maas-import-squashfs
201-debian/tmp/etc/maas/import_squashfs
202-debian/tmp/usr/sbin/maas-import-ephemerals
203-debian/tmp/etc/maas/import_ephemerals
204-debian/tmp/etc/maas/commissioning-user-data
205-# Obsolete, but still available for compatibility:
206-scripts/maas-import-isos usr/sbin
207-
208 # Install new preseed files
209 debian/tmp/usr/share/maas/preseeds
210
211
212=== modified file 'debian/maas-region-controller.postinst'
213--- debian/maas-region-controller.postinst 2012-10-16 14:30:48 +0000
214+++ debian/maas-region-controller.postinst 2012-11-13 20:47:22 +0000
215@@ -104,14 +104,6 @@
216 fi
217 }
218
219-configure_maas_tgt(){
220- local tgtcfg="/etc/tgt/targets.conf"
221- [ -d /etc/tgt/conf.d/ ] ||
222- echo "Warning! $tgtcfg did not exist" 1>&2;
223- mkdir -p /etc/tgt/conf.d/ /var/lib/maas/ephemeral/
224- ln -sf /var/lib/maas/ephemeral/tgt.conf /etc/tgt/conf.d/maas.conf
225-}
226-
227 configure_maas_default_url() {
228 local ipaddr="$1"
229
230@@ -227,11 +219,6 @@
231 configure_maas_workers_rabbitmq_user "$ipaddr"
232
233 #########################################################
234- ######## add maas.conf to tgt conf.d ####################
235- #########################################################
236- configure_maas_tgt
237-
238- #########################################################
239 ################ Configure Database ###################
240 #########################################################
241
242
243=== modified file 'debian/maas-region-controller.postrm'
244--- debian/maas-region-controller.postrm 2012-10-11 18:16:28 +0000
245+++ debian/maas-region-controller.postrm 2012-11-13 20:47:22 +0000
246@@ -27,11 +27,6 @@
247 fi
248
249 # Delete symlink
250- if [ -L /etc/tgt/conf.d/maas.conf ]; then
251- rm -rf /etc/tgt/conf.d/maas.conf
252- fi
253-
254- # Delete symlink
255 if [ -L /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas ]; then
256 rm -rf /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas
257 fi

Subscribers

People subscribed via source and target branches