launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #14216
[Merge] lp:~andreserl/maas/packaging.raring-updates into lp:~maas-maintainers/maas/packaging.quantal
Andres Rodriguez has proposed merging lp:~andreserl/maas/packaging.raring-updates into lp:~maas-maintainers/maas/packaging.quantal.
Requested reviews:
MAAS Maintainers (maas-maintainers)
Related bugs:
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.raring-updates/+merge/134198
--
https://code.launchpad.net/~andreserl/maas/packaging.raring-updates/+merge/134198
Your team MAAS Maintainers is requested to review the proposed merge of lp:~andreserl/maas/packaging.raring-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:47:22 +0000
@@ -3,12 +3,39 @@
[ Raphaël Badin ]
* debian/maas-dns.postinst: fix permissions and group ownership of
file /etc/bind/maas/named.conf.rndc.maas. (LP: #1066935)
+ * debian/control: Remove the dependency of maas-cluster-controller
+ on rabbitmq-server. (LP: #1072744)
+ * debian/extras/99-maas-sudoers: Add sudo rule for script
+ /usr/sbin/maas-import-pxe-files.
[ 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)
+ [ Jeroen Vermeulen ]
+ * debian/maas-cluster-controller.install: Install import scripts.
+ * debian/maas-cluster-controller.postinst: Configure tgt (the iSCSI server)
+ so the import script can install files to it.
+ * debian/maas-cluster-controller.postrm: Clean up tgt config.
+ * debian/maas-region-controller.install: Move import scripts out to the
+ cluster controller, and drop the maas-import-isos compatibility script.
+ * debian/maas-region-controller.postinst: Remove tgt config.
+ * debian/maas-region-controller.postrm: Remove tgt config cleanup.
+
+ [ Gavin Panella ]
+ * debian/extras/99-maas: squashfs image download is no longer needed.
+ * debian/maas-cluster-controller.install: maas-import-squashfs and its
+ configuration file are no longer part of upstream.
+
+ [ Andres Rodriguez ]
+ * debian/control:
+ - maas-cluster-controller Conflicts with tftpd-hpa (LP: #1076028)
+ - maas-dns: Conflicts with dnsmasq
+ * 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.
+
-- Julian Edwards <julian.edwards@xxxxxxxxxxxxx> Fri, 26 Oct 2012 12:50:20 +0200
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:47:22 +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/extras/99-maas'
--- debian/extras/99-maas 2012-10-04 18:52:27 +0000
+++ debian/extras/99-maas 2012-11-13 20:47:22 +0000
@@ -1,7 +1,4 @@
# /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas
-#
+#
# Enable launchpad personal package archives for squid-deb-proxy
ppa.launchpad.net
-# Enable access to MAAS server HTTP to allow squashfs download
-# during install
-maas.internal.example.com # maasurl
=== modified file 'debian/extras/99-maas-sudoers'
--- debian/extras/99-maas-sudoers 2012-09-25 23:18:02 +0000
+++ debian/extras/99-maas-sudoers 2012-11-13 20:47:22 +0000
@@ -1,2 +1,3 @@
maas ALL= NOPASSWD: /usr/sbin/service maas-dhcp-server restart
maas ALL= NOPASSWD: /usr/sbin/maas-provision
+maas ALL= NOPASSWD: /usr/sbin/maas-import-pxe-files
=== 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:47:22 +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
=== modified file 'debian/maas-cluster-controller.install'
--- debian/maas-cluster-controller.install 2012-10-10 19:06:52 +0000
+++ debian/maas-cluster-controller.install 2012-11-13 20:47:22 +0000
@@ -13,6 +13,15 @@
# Install local celery cluster config file
debian/tmp/etc/maas/maas_local_celeryconfig_cluster.py
+# Install maas-import-pxe-files and related files
+debian/tmp/usr/sbin/maas-import-pxe-files
+etc/cron.d/maas-import-pxe-files
+man/maas-import-pxe-files.8 usr/share/man/man8
+debian/tmp/etc/maas/import_pxe_files
+debian/tmp/usr/sbin/maas-import-ephemerals
+debian/tmp/etc/maas/import_ephemerals
+debian/tmp/etc/maas/commissioning-user-data
+
# Install all other stuff
debian/extras/99-maas-sudoers etc/sudoers.d
debian/extras/isc-dhcp-server.override etc/init
=== modified file 'debian/maas-cluster-controller.postinst'
--- debian/maas-cluster-controller.postinst 2012-10-11 18:16:28 +0000
+++ debian/maas-cluster-controller.postinst 2012-11-13 20:47:22 +0000
@@ -17,6 +17,15 @@
chmod -R 775 /var/log/maas/oops
}
+configure_maas_tgt(){
+ # Set up iSCSI: add maas.conf to tgt conf.d.
+ local tgtcfg="/etc/tgt/targets.conf"
+ [ -d /etc/tgt/conf.d/ ] ||
+ echo "Warning! $tgtcfg did not exist" 1>&2;
+ mkdir -p /etc/tgt/conf.d/ /var/lib/maas/ephemeral/
+ ln -sf /var/lib/maas/ephemeral/tgt.conf /etc/tgt/conf.d/maas.conf
+}
+
if [ "$1" = "configure" ] && [ -z "$2" ]; then
# logging
create_log_dir
@@ -32,6 +41,8 @@
sed -i "s|^CLUSTER_UUID\ \= None$|CLUSTER_UUID = '"$uuid"'|" \
/etc/maas/maas_local_celeryconfig_cluster.py
fi
+
+ configure_maas_tgt
fi
if ([ "$1" = "configure" ] && [ -z "$2" ]) || [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
=== modified file 'debian/maas-cluster-controller.postrm'
--- debian/maas-cluster-controller.postrm 2012-10-11 18:16:28 +0000
+++ debian/maas-cluster-controller.postrm 2012-11-13 20:47:22 +0000
@@ -18,6 +18,11 @@
rm -rf /var/lib/maas
fi
+ # Delete symlink for iSCSI config.
+ if [ -L /etc/tgt/conf.d/maas.conf ]; then
+ rm -rf /etc/tgt/conf.d/maas.conf
+ fi
+
esac
#DEBHELPER#
=== modified file 'debian/maas-region-controller.install'
--- debian/maas-region-controller.install 2012-10-26 10:51:16 +0000
+++ debian/maas-region-controller.install 2012-11-13 20:47:22 +0000
@@ -22,21 +22,6 @@
# Install txlongpoll config file
debian/tmp/etc/maas/txlongpoll.yaml
-# Install maas-import-pxe-files
-debian/tmp/usr/sbin/maas-import-pxe-files
-
-# Install maas-import-pxe-files and related files
-etc/cron.d/maas-import-pxe-files
-man/maas-import-pxe-files.8 usr/share/man/man8
-debian/tmp/etc/maas/import_pxe_files
-debian/tmp/usr/sbin/maas-import-squashfs
-debian/tmp/etc/maas/import_squashfs
-debian/tmp/usr/sbin/maas-import-ephemerals
-debian/tmp/etc/maas/import_ephemerals
-debian/tmp/etc/maas/commissioning-user-data
-# Obsolete, but still available for compatibility:
-scripts/maas-import-isos usr/sbin
-
# Install new preseed files
debian/tmp/usr/share/maas/preseeds
=== modified file 'debian/maas-region-controller.postinst'
--- debian/maas-region-controller.postinst 2012-10-16 14:30:48 +0000
+++ debian/maas-region-controller.postinst 2012-11-13 20:47:22 +0000
@@ -104,14 +104,6 @@
fi
}
-configure_maas_tgt(){
- local tgtcfg="/etc/tgt/targets.conf"
- [ -d /etc/tgt/conf.d/ ] ||
- echo "Warning! $tgtcfg did not exist" 1>&2;
- mkdir -p /etc/tgt/conf.d/ /var/lib/maas/ephemeral/
- ln -sf /var/lib/maas/ephemeral/tgt.conf /etc/tgt/conf.d/maas.conf
-}
-
configure_maas_default_url() {
local ipaddr="$1"
@@ -227,11 +219,6 @@
configure_maas_workers_rabbitmq_user "$ipaddr"
#########################################################
- ######## add maas.conf to tgt conf.d ####################
- #########################################################
- configure_maas_tgt
-
- #########################################################
################ Configure Database ###################
#########################################################
=== modified file 'debian/maas-region-controller.postrm'
--- debian/maas-region-controller.postrm 2012-10-11 18:16:28 +0000
+++ debian/maas-region-controller.postrm 2012-11-13 20:47:22 +0000
@@ -27,11 +27,6 @@
fi
# Delete symlink
- if [ -L /etc/tgt/conf.d/maas.conf ]; then
- rm -rf /etc/tgt/conf.d/maas.conf
- fi
-
- # Delete symlink
if [ -L /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas ]; then
rm -rf /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas
fi
