launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #14218
[Merge] lp:~andreserl/maas/packaging.quantal-updates into lp:~maas-maintainers/maas/packaging.quantal
Andres Rodriguez has proposed merging lp:~andreserl/maas/packaging.quantal-updates into lp:~maas-maintainers/maas/packaging.quantal.
Requested reviews:
MAAS Maintainers (maas-maintainers)
Related bugs:
Bug #1072744 in maas (Ubuntu): "maas-cluster-controller depends on rabbitmq-server."
https://bugs.launchpad.net/ubuntu/+source/maas/+bug/1072744
Bug #1076028 in maas (Ubuntu): "maas-cluster-controller should conflict with tftpd-hpa"
https://bugs.launchpad.net/ubuntu/+source/maas/+bug/1076028
For more details, see:
https://code.launchpad.net/~andreserl/maas/packaging.quantal-updates/+merge/134200
--
https://code.launchpad.net/~andreserl/maas/packaging.quantal-updates/+merge/134200
Your team MAAS Maintainers is requested to review the proposed merge of lp:~andreserl/maas/packaging.quantal-updates into lp:~maas-maintainers/maas/packaging.quantal.
=== modified file 'debian/changelog'
--- debian/changelog 2012-10-26 10:51:16 +0000
+++ debian/changelog 2012-11-13 20:49:31 +0000
@@ -9,7 +9,16 @@
is no longer required as upstream no longer stores files in the filesystem.
(LP: #1069734)
- -- Julian Edwards <julian.edwards@xxxxxxxxxxxxx> Fri, 26 Oct 2012 12:50:20 +0200
+ [ Andres Rodriguez ]
+ * debian/control:
+ - maas-cluster-controller Conflicts with tftpd-hpa (LP: #1076028)
+ - maas-dns: Conflicts with dnsmasq
+ - Drop Dependency on rabbitmq-server for maas-cluster-controller. (LP: #1072744)
+ * 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.
+
+ -- Andres Rodriguez <andreserl@xxxxxxxxxx> Tue, 13 Nov 2012 14:58:21 -0500
maas (0.1+bzr1269+dfsg-0ubuntu1) quantal-proposed; urgency=low
=== modified file 'debian/control'
--- debian/control 2012-10-16 14:30:48 +0000
+++ debian/control 2012-11-13 20:49:31 +0000
@@ -17,7 +17,7 @@
Architecture: all
Pre-Depends: ${misc:Pre-Depends}
Depends: maas-cluster-controller, maas-region-controller, python-django-maas
-Conflicts: dnsmasq, maas-provision, tftpd-hpa
+Conflicts: maas-provision
Replaces: maas-provision
Description: Ubuntu MAAS Server
Ubuntu MAAS Server is the successor to Orchestra. It offers a
@@ -176,7 +176,6 @@
python-tempita,
python-twisted,
python-zope.interface,
- rabbitmq-server,
rsyslog,
syslinux-common,
tgt,
@@ -185,7 +184,7 @@
${misc:Depends},
${python:Depends}
Suggests: maas-dhcp (= ${binary:Version})
-Conflicts: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
+Conflicts: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), tftpd-hpa
Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
Description: Ubuntu MAAS Cluster Controller
Ubuntu MAAS Server is the successor to Orchestra. It offers a
@@ -261,7 +260,7 @@
maas-region-controller (= ${binary:Version}),
maas-dhcp (= ${binary:Version}),
${misc:Depends}
-Conflicts: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
+Conflicts: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1), dnsmasq
Replaces: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
Description: Ubuntu MAAS Server - DNS configuration (metapackage)
Ubuntu MAAS Server is the successor to Orchestra. It offers a
=== modified file 'debian/maas-cluster-controller.config'
--- debian/maas-cluster-controller.config 2012-10-08 17:16:30 +0000
+++ debian/maas-cluster-controller.config 2012-11-13 20:49:31 +0000
@@ -14,6 +14,11 @@
# Attempt to pre-populate if installing on the region controller.
if [ -e /etc/maas/maas_local_settings.py ]; then
url=$(awk '$1 == "DEFAULT_MAAS_URL" { split($0,array,"\"")} END{print array[2] }' /etc/maas/maas_local_settings.py)
+ # If the URL doesn't end in /MAAS then add it. This helps upgrades from
+ # precise for which the URL didn't contain /MAAS, which is now required.
+ if ! echo $url | grep -qs "/MAAS$"; then
+ url="${url}/MAAS"
+ fi
db_set maas-cluster-controller/maas-url "$url"
else
# Will only get here if dbconf value not already set, or
Follow ups