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

[Andres Rodriguez]

* debian/maas-region-controller.postinst:
  - Add MAAS server to allowed mirror in squid-deb-proxy
* debian/control: Depends on python-netifaces, python-lxml.
* Handle removal of non existant files (LP: #1059556):
  - debian/maintscript: Added to handle removal of conffiles.
  - debian/control: Add Pre-depends and bump debhelper version.
* update po files for the templates.
* debian/extras/99-maas: Install in usr/share/maas/conf and symlink to the
appropriate etc dir.

[Scott Moser (smoser)]

Approve, but please just remove the 'grep' in configure_maas_squid_deb_proxy .

Secondly, please try to avoid conf-file prompts.

review: Approve

[lp:~andreserl/maas/packaging_updates_bzr1170]

118. By Andres Rodriguez on 2012-10-04

Source dbconfig conf file for maas-region-controller on upgrade because
it writes a new config file and no longer preservers the previous password.

119. By Andres Rodriguez on 2012-10-04

Correctly handle upgrades

120. By Andres Rodriguez on 2012-10-05

debian/extras/99-maas: Install in usr/share/maas/conf and symlink to the
appropriate etc dir.

[Andres Rodriguez (andreserl)]

Addressed smoser's suggetions.

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-03 06:50:25 +0000
+++ debian/changelog	2012-10-05 04:31:21 +0000
@@ -1,4 +1,4 @@
-maas (0.1+bzr1139+dfsg-0ubuntu2) UNRELEASED; urgency=low
+maas (0.1+bzr1170+dfsg-0ubuntu1) UNRELEASED; urgency=low
 
   * New upstream release.
 
@@ -24,13 +24,22 @@
 
   [ Andres Rodriguez ]
   * debian/maas-dhcp.postinst: Stop isc-dhcp-server not isc_dhcp_server.
-  * debian/maas-region-controller.postinst: Always update passwords
-    on upgrade. No longer check versioning. (LP: #1060094).
+  * debian/maas-region-controller.postinst:
+    - Always update passwords on upgrade. No longer check versioning. (LP: #1060094).
+    - Add MAAS server to allowed mirror in squid-deb-proxy
+    - Source dbconfig conf file for maas-region-controller on upgrade because
+      it writes a new config file and no longer preservers the previous password.
   * debian/maas-cluster-controller.maas-cluster-celery.upstart: Remove set{uid/gid}.
-  * debian/control: Depends on python-netifaces.
+  * debian/control: Depends on python-netifaces, python-lxml.
   * debian/maas-region-controller: Install maas-import-squashfs
+  * Handle removal of non existant files (LP: #1059556):
+    - debian/maintscript: Added to handle removal of conffiles.
+    - debian/control: Add Pre-depends and bump debhelper version.
+  * update po files for the templates.
+  * debian/extras/99-maas: Install in usr/share/maas/conf and symlink to the
+    appropriate etc dir.
 
- -- Julian Edwards <[e-mail]>  Wed, 03 Oct 2012 16:49:24 +1000
+ -- Andres Rodriguez <[e-mail]>  Thu, 04 Oct 2012 13:34:12 -0400
 
 maas (0.1+bzr1110+dfsg-0ubuntu1) quantal; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2012-10-02 19:37:19 +0000
+++ debian/control	2012-10-05 04:31:21 +0000
@@ -2,7 +2,7 @@
 Section: net
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
-Build-Depends: debhelper (>= 8),
+Build-Depends: debhelper (>= 8.1.0~),
                dh-apport,
                po-debconf,
                python (>= 2.7),
@@ -15,6 +15,7 @@
 
 Package: maas
 Architecture: all
+Pre-Depends: ${misc:Pre-Depends}
 Depends: maas-cluster-controller, maas-region-controller, python-django-maas
 Conflicts: dnsmasq, maas-provision, tftpd-hpa
 Replaces: maas-provision
@@ -188,6 +189,7 @@
          python-convoy,
          python-dbus,
          python-lockfile,
+         python-lxml,
          python-maas-client (= ${binary:Version}),
          python-netaddr,
          python-oops,

=== modified file 'debian/extras/99-maas'
--- debian/extras/99-maas	2012-04-12 03:37:08 +0000
+++ debian/extras/99-maas	2012-10-05 04:31:21 +0000
@@ -2,3 +2,6 @@
 # 
 # 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/maas-region-controller.install'
--- debian/maas-region-controller.install	2012-10-02 18:42:28 +0000
+++ debian/maas-region-controller.install	2012-10-05 04:31:21 +0000
@@ -47,4 +47,4 @@
 debian/extras/maas usr/sbin
 debian/extras/20-maas.conf etc/rsyslog.d
 debian/extras/maas_remote_syslog_compress etc/cron.d
-debian/extras/99-maas etc/squid-deb-proxy/mirror-dstdomain.acl.d
+debian/extras/99-maas usr/share/maas/conf

=== modified file 'debian/maas-region-controller.postinst'
--- debian/maas-region-controller.postinst	2012-10-02 19:37:19 +0000
+++ debian/maas-region-controller.postinst	2012-10-05 04:31:21 +0000
@@ -37,6 +37,14 @@
 	fi
 }
 
+restart_squid_deb_proxy() {
+	if [ -x /usr/sbin/invoke-rc.d ]; then
+		invoke-rc.d squid-deb-proxy restart || true
+	else
+		/etc/init.d/squid-deb-proxy restart || true
+	fi
+}
+
 add_user_group(){
 	local user="maas"
 	local group="maas"
@@ -125,6 +133,19 @@
 	fi
 }
 
+configure_maas_squid_deb_proxy() {
+	local ipaddr="$1"
+
+	if [ -e /usr/share/maas/conf/99-maas -a \
+	     ! -L /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas ]; then
+		ln -sf /usr/share/maas/conf/99-maas \
+		       /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas
+	fi
+
+	sed -i "s/\(^[a-zA-Z0-9\.\-].*\) # maasurl$/$ipaddr # maasurl/" \
+             /usr/share/maas/conf/99-maas
+}
+
 if [ "$1" = "configure" ] && [ -z "$2" ]; then
 	#########################################################
 	################ User/Group Creatiion  ##################
@@ -174,6 +195,7 @@
 	# Set the IP address of the interface with default route
 	if [ -n "$ipaddr" ]; then
 		configure_maas_default_url "$ipaddr"
+		configure_maas_squid_deb_proxy "$ipaddr"
 		db_subst maas/installation-note MAAS_URL "$ipaddr"
 		db_set maas/default-maas-url "$ipaddr"
 	fi
@@ -253,6 +275,7 @@
 	db_set maas/default-maas-url "$ipaddr"
 	if [ -n "$ipaddr" ]; then
 		configure_maas_default_url "$ipaddr"
+		configure_maas_squid_deb_proxy "$ipaddr"
 	fi
 
 elif [ "$1" = "configure" ] && dpkg --compare-versions "$2" gt 0.1+bzr266+dfsg-0ubuntu1; then
@@ -268,13 +291,21 @@
 	db_get maas/default-maas-url
 	ipaddr="$RET"
 	configure_maas_default_url "$ipaddr"
+	configure_maas_squid_deb_proxy "$ipaddr"
 	# make sure rabbitmq is running
 	restart_rabbitmq
 	configure_maas_txlongpoll_rabbitmq_user
 	# Handle celery/rabbitmq publishing
 	configure_maas_workers_rabbitmq_user
 	# handle database upgrade
-	dbc_go maas-region-controller $@
+	if [ -f /etc/dbconfig-common/maas-region-controller.conf ]; then
+		# source dbconfig-common db config for maas-region-controller
+		# before upgrading database, otherwise a new config is written
+		# but the password is no longer preserved.
+		. /etc/dbconfig-common/maas-region-controller.conf
+	else
+		dbc_go maas-region-controller $@
+	fi
 	configure_maas_database "$dbc_dbpass"
 
 	maas_sync_migrate_db
@@ -283,6 +314,8 @@
 
 restart_apache2
 
+restart_squid_deb_proxy
+
 db_stop
 
 #DEBHELPER#

=== modified file 'debian/maas-region-controller.postrm'
--- debian/maas-region-controller.postrm	2012-09-28 02:40:23 +0000
+++ debian/maas-region-controller.postrm	2012-10-05 04:31:21 +0000
@@ -31,6 +31,16 @@
 			deluser maas || true
 		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
+
 		# Remove rabbitmq/longpoll/celery
 		longpoll_user="maas_longpoll"
 		longpoll_vhost="/maas_longpoll"

=== added file 'debian/maintscript'
--- debian/maintscript	1970-01-01 00:00:00 +0000
+++ debian/maintscript	2012-10-05 04:31:21 +0000
@@ -0,0 +1,2 @@
+rm_conffile /etc/init/maas-celery.conf 0.1+bzr971+dfsg-0ubuntu2
+rm_conffile /etc/dbconfig-common/maas.conf 0.1+bzr971+dfsg-0ubuntu2

=== modified file 'debian/po/POTFILES.in'
--- debian/po/POTFILES.in	2012-04-04 18:52:33 +0000
+++ debian/po/POTFILES.in	2012-10-05 04:31:21 +0000
@@ -1,2 +1,2 @@
-[type: gettext/rfc822deb] maas-dhcp.templates
-[type: gettext/rfc822deb] maas.templates
+[type: gettext/rfc822deb] maas-region-controller.templates
+[type: gettext/rfc822deb] maas-cluster-controller.templates

=== modified file 'debian/po/templates.pot'
--- debian/po/templates.pot	2012-04-04 18:52:33 +0000
+++ debian/po/templates.pot	2012-10-05 04:31:21 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: maas\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2012-04-04 14:45-0400\n"
+"POT-Creation-Date: 2012-10-04 13:40-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,73 +17,15 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: string
-#. Description
-#: ../maas-dhcp.templates:1001
-msgid "Set the network range for DHCP Clients:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../maas-dhcp.templates:1001
-msgid ""
-"Ubuntu MAAS Server can manage DHCP for address allocation for the "
-"provisioned systems.  If the network range for the DHCP is different from "
-"the default (192.168.1.5,192.168.1.200), you should set it here."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../maas-dhcp.templates:1001
-msgid "An example of how a network range should be specified is:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../maas-dhcp.templates:1001
-msgid "10.10.10.2,10.10.10.254"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../maas-dhcp.templates:2001
-msgid "Set default Gateway for DHCP Clients:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../maas-dhcp.templates:2001
-msgid ""
-"Ubuntu MAAS Server can manage DHCP for address allocation for the "
-"provisioned systems.  If the Ubuntu MAAS Server is NOT the default Gateway "
-"for the provisioned systems, you should set the default Gateway here, "
-"otherwise leave this blank."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../maas-dhcp.templates:3001
-msgid "Set the domain name for DHCP Clients:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../maas-dhcp.templates:3001
-msgid ""
-"Ubuntu MAAS Server can manage DHCP for address allocation for the "
-"provisioned systems. If these systems are required to be under a domain, you "
-"should enter it here."
-msgstr ""
-
 #. Type: note
 #. Description
-#: ../maas.templates:1001
+#: ../maas-region-controller.templates:1001
 msgid "Ubuntu MAAS Server"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../maas.templates:1001
+#: ../maas-region-controller.templates:1001
 msgid ""
 "The Ubuntu MAAS Server has been installed in your system. You can access the "
 "MAAS Web interface here:"
@@ -91,6 +33,50 @@
 
 #. Type: note
 #. Description
-#: ../maas.templates:1001
+#: ../maas-region-controller.templates:1001
 msgid "   http://${MAAS_URL}/MAAS"
 msgstr ""
+
+#. Type: note
+#. Description
+#: ../maas-region-controller.templates:1001
+msgid ""
+"If the automatically detected address above is not in the same network as "
+"the MAAS clients, you need to reconfigure it:"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../maas-region-controller.templates:1001
+msgid "   sudo dpkg-reconfigure maas-region-controller"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../maas-region-controller.templates:2001
+msgid "Ubuntu MAAS PXE/Provisioning network address:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../maas-region-controller.templates:2001
+msgid ""
+"The Ubuntu MAAS Server automatically detects the IP address that is used for "
+"PXE and provisioning. However, it needs to be in the same network as the "
+"clients. If the automatically detected address is not in the same network as "
+"the clients, it must be changed."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../maas-cluster-controller.templates:1001
+msgid "Ubuntu MAAS API address:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../maas-cluster-controller.templates:1001
+msgid ""
+"The MAAS Cluster Controller needs to contact the MAAS server to register its "
+"presence.  Set the URL to the MAAS API here, e.g. http://192.168.1.1/MAAS"
+msgstr ""