Merge lp:~julian-edwards/maas/add-maas-cluster-packaging into lp:~maas-maintainers/maas/packaging

[Julian Edwards]

Split packaging into maas-region-controller, maas-cluster-controller, maas-cli, python-maas-client, maas-common

Add a maas-cluster-controller package

[Andres Rodriguez (andreserl)]

It looks overall. There's still things that need to be fixed which will be commited after this branch lands.

review: Approve

[MAAS Lander (maas-lander)]

No commit message specified.

=== modified file 'debian/control'
--- debian/control	2012-09-21 16:54:02 +0000
+++ debian/control	2012-09-28 07:21:21 +0000
@@ -11,42 +11,94 @@
 
 Package: maas
 Architecture: all
+Depends: python-django-maas, maas-region-controller, maas-cluster-controller
+Conflicts: maas-provision, tftpd-hpa, dnsmasq
+Replaces: maas-provision
+Description: Ubuntu MAAS Server
+ Ubuntu MAAS Server is the successor to Orchestra. It offers a
+ nice UI to provision your Ubuntu servers. Each physical server
+ (“node”) will be commissioned automatically on first boot.
+ During the commissioning process administrators are able to
+ configure hardware settings manually before an automated smoke
+ test and burn-in test are done. Once commissioned, a node can
+ be deployed on demand by name, or allocated to a queue for
+ dynamic allocation to services being deployed on this MAAS.
+ .
+ This package installs a complete MAAS service on a single machine.
+
+Package: maas-common
+Architecture: all
+Conflicts: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
+Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
+Description: Ubuntu MAAS Server
+ Ubuntu MAAS Server is the successor to Orchestra. It offers a
+ nice UI to provision your Ubuntu servers. Each physical server
+ (“node”) will be commissioned automatically on first boot.
+ During the commissioning process administrators are able to
+ configure hardware settings manually before an automated smoke
+ test and burn-in test are done. Once commissioned, a node can
+ be deployed on demand by name, or allocated to a queue for
+ dynamic allocation to services being deployed on this MAAS.
+ .
+ This package contains common files
+
+Package: maas-region-controller
+Architecture: all
 Depends: apache2,
          avahi-daemon,
-         bind9utils,
          dbconfig-common,
          distro-info,
-         freeipmi-tools,
          libapache2-mod-wsgi,
          libjs-raphael,
          libjs-yui3-full,
          libjs-yui3-min,
+         maas-common (= ${binary:Version}),
          postgresql-9.1,
          pwgen,
          python-django,
          python-django-maas (= ${binary:Version}),
          python-django-piston,
          python-django-south,
+         python-maas-provisioningserver (= ${binary:Version}),
          rabbitmq-server,
          rsyslog,
          squid-deb-proxy,
-         syslinux-common,
-         tgt,
-         wget,
          ${misc:Depends},
          ${python:Depends}
-Recommends: openssh-server, maas-dns, maas-dhcp
-Conflicts: maas-provision, tftpd-hpa, dnsmasq
-Replaces: maas-provision
-Description: Ubuntu MAAS Server
- Ubuntu MAAS Server is the successor to Orchestra. It offers a
- nice UI to provision your Ubuntu servers. Each physical server
- (“node”) will be commissioned automatically on first boot.
- During the commissioning process administrators are able to
- configure hardware settings manually before an automated smoke
- test and burn-in test are done. Once commissioned, a node can
- be deployed on demand by name, or allocated to a queue for
- dynamic allocation to services being deployed on this MAAS.
+Recommends: openssh-server
+Suggests: maas-dns
+Conflicts: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
+Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
+Description: Ubuntu MAAS Server
+ Ubuntu MAAS Server is the successor to Orchestra. It offers a
+ nice UI to provision your Ubuntu servers. Each physical server
+ (“node”) will be commissioned automatically on first boot.
+ During the commissioning process administrators are able to
+ configure hardware settings manually before an automated smoke
+ test and burn-in test are done. Once commissioned, a node can
+ be deployed on demand by name, or allocated to a queue for
+ dynamic allocation to services being deployed on this MAAS.
+ .
+ This package installs the region controller services: the web
+ UI and the database.
+
+Package: python-maas-provisioningserver
+Architecture: all
+Depends: ${misc:Depends},
+         ${python:Depends}
+Conflicts: python-django-maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
+Replaces: python-django-maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
+Description: Ubuntu MAAS Server
+ Ubuntu MAAS Server is the successor to Orchestra. It offers a
+ nice UI to provision your Ubuntu servers. Each physical server
+ (“node”) will be commissioned automatically on first boot.
+ During the commissioning process administrators are able to
+ configure hardware settings manually before an automated smoke
+ test and burn-in test are done. Once commissioned, a node can
+ be deployed on demand by name, or allocated to a queue for
+ dynamic allocation to services being deployed on this MAAS.
+ .
+ This package contains the provisioning server libraries.
 
 Package: maas-cli
 Architecture: all
@@ -87,6 +139,46 @@
  .
  This package contains the client API Python modules.
 
+Package: maas-cluster-controller
+Architecture: all
+Depends: bind9utils,
+         freeipmi-tools,
+         maas-cli (=${binary:Version}),
+         maas-common (=${binary:Version}),
+         python-celery,
+         python-httplib2,
+         python-lockfile,
+         python-maas-provisioningserver (=${binary:Version}),
+         python-netaddr,
+         python-oauth,
+         python-tempita,
+         python-twisted,
+         python-txtftp,
+         python-zope.interface,
+         rabbitmq-server,
+         rsyslog,
+         syslinux-common,
+         tgt,
+         wget,
+         ${misc:Depends},
+         ${python:Depends}
+Suggests: maas-dhcp (= ${binary:Version})
+Conflicts: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
+Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
+Description: Ubuntu MAAS Cluster Controller
+ Ubuntu MAAS Server is the successor to Orchestra. It offers a
+ nice UI to provision your Ubuntu servers. Each physical server
+ (“node”) will be commissioned automatically on first boot.
+ During the commissioning process administrators are able to
+ configure hardware settings manually before an automated smoke
+ test and burn-in test are done. Once commissioned, a node can
+ be deployed on demand by name, or allocated to a queue for
+ dynamic allocation to services being deployed on this MAAS.
+ .
+ This package contains the cluster controller, which is
+ responsible for controlling remote DHCP/TFTP instances on their
+ own subnets.
+
 Package: python-django-maas
 Section: python
 Architecture: all
@@ -126,7 +218,7 @@
 
 Package: maas-dhcp
 Architecture: all
-Depends: maas (= ${binary:Version}), isc-dhcp-server
+Depends: ${misc:Depends}, isc-dhcp-server
 Conflicts: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
 Replaces: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
 Description: Ubuntu MAAS Server - DHCP Configuration (meta-package)
@@ -143,7 +235,7 @@
 
 Package: maas-dns
 Architecture: all
-Depends: ${misc:Depends}, maas (= ${binary:Version}), bind9
+Depends: ${misc:Depends}, maas-dhcp (= ${binary:Version}), bind9
 Conflicts: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
 Replaces: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
 Description: Ubuntu MAAS Server - DNS configuration (metapackage)

=== added file 'debian/maas-cluster-controller.config'
--- debian/maas-cluster-controller.config	1970-01-01 00:00:00 +0000
+++ debian/maas-cluster-controller.config	2012-09-28 07:21:21 +0000
@@ -0,0 +1,22 @@
+#!/bin/sh -e
+
+# Only ask for new installations and reconfiguring.
+# XXX Fix to not ask during new installations when upgrading from the old
+# maas package or installing from the CD.
+if ([ "$1" = "configure" ] && [ -z "$2" ]) || [ "$1" = "reconfigure" ]; then
+        . /usr/share/debconf/confmodule
+
+    db_get maas-cluster-controller/maas-url || true
+    if [ -n "$RET" ]; then
+        db_set maas-cluster-controller/maas-url "$RET"
+    else
+        # 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)
+            db_set maas-cluster-controller/maas-url "$url"
+        fi
+    fi
+    db_input high maas-cluster-controller/maas-url || true
+    db_go
+fi
+#DEBHELPER#

=== added file 'debian/maas-cluster-controller.dirs'
--- debian/maas-cluster-controller.dirs	1970-01-01 00:00:00 +0000
+++ debian/maas-cluster-controller.dirs	2012-09-28 07:21:21 +0000
@@ -0,0 +1,1 @@
+etc/maas

=== added file 'debian/maas-cluster-controller.install'
--- debian/maas-cluster-controller.install	1970-01-01 00:00:00 +0000
+++ debian/maas-cluster-controller.install	2012-09-28 07:21:21 +0000
@@ -0,0 +1,12 @@
+# Install twisted plugins
+twisted/plugins/maasps.py usr/share/pyshared/twisted/plugins
+
+# Install PSERV config file
+debian/tmp/etc/maas/pserv.yaml
+
+# Install cluster config file
+debian/tmp/etc/maas/maas_cluster.conf
+
+# Install all other stuff
+debian/extras/99-maas-sudoers etc/sudoers.d
+debian/extras/maas-provision usr/sbin

=== added file 'debian/maas-cluster-controller.logrotate'
--- debian/maas-cluster-controller.logrotate	1970-01-01 00:00:00 +0000
+++ debian/maas-cluster-controller.logrotate	2012-09-28 07:21:21 +0000
@@ -0,0 +1,9 @@
+/var/log/maas/pserv.log {
+ rotate 5
+ weekly
+ compress
+ missingok
+ postrotate
+  [ -r /var/run/maas-pserv.pid ] && kill -s USR2 $(cat /var/run/maas-pserv.pid) || true
+ endscript
+}

=== added file 'debian/maas-cluster-controller.maas-celery.upstart'
--- debian/maas-cluster-controller.maas-celery.upstart	1970-01-01 00:00:00 +0000
+++ debian/maas-cluster-controller.maas-celery.upstart	2012-09-28 07:21:21 +0000
@@ -0,0 +1,24 @@
+# maas-cluster-controller - provisioning service
+#
+# MAAS Cluster Controller Service
+
+description     "MAAS Cluster Controller"
+author "Julian Edwards <[e-mail]>"
+
+start on filesystem and net-device-up
+stop on runlevel [016]
+
+env CONFIG_FILE=/etc/maas/maas_cluster.conf
+
+pre-start script
+    if [ ! -f $CONFIG_FILE ]; then
+        echo "$CONFIG_FILE does not exist.  Aborting."
+        stop
+        exit 0
+    fi
+end script
+
+script
+    . $CONFIG_FILE  # sets MAAS_URL
+    exec /usr/sbin/maas-provision start-cluster-controller $MAAS_URL
+end script

=== renamed file 'debian/maas.maas-pserv.upstart' => 'debian/maas-cluster-controller.maas-pserv.upstart'
=== added file 'debian/maas-cluster-controller.postinst'
--- debian/maas-cluster-controller.postinst	1970-01-01 00:00:00 +0000
+++ debian/maas-cluster-controller.postinst	2012-09-28 07:21:21 +0000
@@ -0,0 +1,38 @@
+#!/bin/sh -e
+
+. /usr/share/debconf/confmodule
+db_version 2.0
+
+add_user_group(){
+    local user="maas"
+    local group="maas"
+    if ! getent group "$group" >/dev/null; then
+        addgroup --quiet --system "$group" || true
+    fi
+    if ! getent passwd "$user" > /dev/null 2>&1; then
+        adduser --quiet \
+                    --system \
+                    --group \
+                    --no-create-home \
+                    "$user" || true
+    fi
+}
+
+if [ "$1" = "configure" ] && [ -z "$2" ]; then
+    add_user_group
+
+    if grep -qs "^CLUSTER_UUID\ \= None$" /etc/maas/maas_local_celeryconfig.py; then
+        local uuid="$(uuidgen)"
+        sed -i "s|^CLUSTER_UUID\ \= None$|CLUSTER_UUID = '"$uuid"'|" \
+                       /etc/maas/maas_local_celeryconfig.py
+    fi
+fi
+
+if ([ "$1" = "configure" ] && [ -z "$2" ]) || [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
+    # Get the MAAS_URL on configure/reconfigure and write it to the conf file.
+    db_get maas-cluster-controller/maas-url || true
+    sed -i "s|MAAS_URL=.*|MAAS_URL="$RET"|" /etc/maas/maas_cluster.conf
+fi
+
+#DEBHELPER#
+exit 0

=== added file 'debian/maas-cluster-controller.templates'
--- debian/maas-cluster-controller.templates	1970-01-01 00:00:00 +0000
+++ debian/maas-cluster-controller.templates	2012-09-28 07:21:21 +0000
@@ -0,0 +1,6 @@
+Template: maas-cluster-controller/maas-url
+Type: string
+Default: http://<MAAS host>/MAAS
+_Description: Ubuntu MAAS API address:
+ The MAAS Cluster Controller needs to contact the MAAS server to
+ register its presence.  Set the URL to the MAAS API here.

=== added file 'debian/maas-common.install'
--- debian/maas-common.install	1970-01-01 00:00:00 +0000
+++ debian/maas-common.install	2012-09-28 07:21:21 +0000
@@ -0,0 +1,3 @@
+# Install Celery Config
+debian/tmp/etc/maas/celeryconfig.py
+debian/tmp/etc/maas/maas_local_celeryconfig.py

=== added file 'debian/maas-common.links'
--- debian/maas-common.links	1970-01-01 00:00:00 +0000
+++ debian/maas-common.links	2012-09-28 07:21:21 +0000
@@ -0,0 +1,2 @@
+etc/maas/maas_local_celeryconfig.py usr/share/maas/maas_local_celeryconfig.py
+etc/maas/celeryconfig.py usr/share/maas/celeryconfig.py

=== removed file 'debian/maas-dhcp.config'
--- debian/maas-dhcp.config	2012-09-14 17:55:18 +0000
+++ debian/maas-dhcp.config	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-#!/bin/sh -e
-
-# Only ask this question on new installs and reconfigures
-if ([ "$1" = "configure" ] && [ -z "$2" ]) || [ "$1" = "reconfigure" ]; then
-        . /usr/share/debconf/confmodule
-
-	db_input high maas-dhcp/maas-dhcp-enabled || true
-	db_go
-	db_get maas-dhcp/maas-dhcp-enabled || true
-	if [ "$RET" = "true" ]; then
-		db_input high maas-dhcp/maas-dhcp-range || true
-		db_go
-		db_input high maas-dhcp/maas-dhcp-netmask || true
-		db_go
-		db_input high maas-dhcp/maas-dhcp-broadcast || true
-		db_go
-		db_input high maas-dhcp/maas-dhcp-gateway || true
-		db_go
-		db_input high maas-dhcp/maas-dhcp-interface || true
-		db_go
-		db_input low maas-dhcp/maas-dhcp-addr || true
-		db_go
-	fi
-
-fi
-#DEBHELPER#

=== modified file 'debian/maas-dhcp.postinst'
--- debian/maas-dhcp.postinst	2012-09-14 17:55:18 +0000
+++ debian/maas-dhcp.postinst	2012-09-28 07:21:21 +0000
@@ -3,49 +3,6 @@
 . /usr/share/debconf/confmodule
 db_version 2.0
 
-if ([ "$1" = "configure" ] && [ -z "$2" ]) || [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
-	db_get maas-dhcp/maas-dhcp-enabled || true
-	if [ "$RET" = "true" ]; then
-		# Obtain the DHCP range
-		db_get maas-dhcp/maas-dhcp-range || true
-		range="$RET"
-		range_low=$(echo $range | cut -f1 -d",")
-		range_high=$(echo $range | cut -f2 -d",")
-
-		# Obtain the netmask
-		db_get maas-dhcp/maas-dhcp-netmask || true
-		netmask="$RET"
-
-		# Obtain the broadcast
-		db_get maas-dhcp/maas-dhcp-broadcast || true
-		broadcast="$RET"
-
-		# Obtain the gateway
-		db_get maas-dhcp/maas-dhcp-gateway || true
-		gateway="$RET"
-
-		# Obtain the interfaces
-		db_get maas-dhcp/maas-dhcp-interface || true
-		interface="$RET"
-
-		# Obtain the interfaces
-		db_get maas-dhcp/maas-dhcp-addr || true
-		addr="$RET"
-
-		if [ -z "$addr" ]; then
-			addr=$(ifconfig "$interface" |
-			       awk '$1 == "inet" { sub("addr:","",$2); print $2 }')
-			[ -n "$addr" ] ||
-				{ echo "failed to get ip for $interface" 1>&2; exit 1; }
-		fi
-
-		maas config_master_dhcp --ip-range-low="$range_low" --ip-range-high="$range_high" \
-				--router-ip="$gateway" --subnet-mask="$netmask" --broadcast-ip="$broadcast" \
-				--interface="$interface" --ip="$addr"
-	fi
-
-fi
-
 if [ "$1" = "configure" ]; then
    dhcpd_prof="/etc/apparmor.d/usr.sbin.dhcpd"
    if [ -f "${dhcpd_prof}" ] &&

=== removed file 'debian/maas-dhcp.templates'
--- debian/maas-dhcp.templates	2012-09-14 17:55:18 +0000
+++ debian/maas-dhcp.templates	1970-01-01 00:00:00 +0000
@@ -1,65 +0,0 @@
-Template: maas-dhcp/maas-dhcp-enabled
-Type: boolean
-Default: true
-_Description: Enable Ubuntu MAAS Server managed DHCP:
- Ubuntu MAAS Server can manage DHCP for address allocation for
- the provisioned systems.  If you manage your DHCP elsewhere,
- you should disable this option.
-
-Template: maas-dhcp/maas-dhcp-range
-Type: string
-Default: 192.168.1.5,192.168.1.200
-_Description: Set the network range for DHCP Clients:
- 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.
- .
- An example of how a network range should be specified is:
- .
- 192.168.1.5,192.168.1.200
-
-Template: maas-dhcp/maas-dhcp-gateway
-Type: string
-Default: 192.168.1.1
-_Description: Set default Gateway for DHCP Clients:
- Ubuntu MAAS Server can manage DHCP for address allocation for
- the provisioned systems.  If the Ubuntu MAAS Server Gateway
- address is not the default address (192.168.1.1), you must set
- it here.
-
-Template: maas-dhcp/maas-dhcp-netmask
-Type: string
-Default: 255.255.255.0
-_Description: Set the Netmask for the DHCP Network Range:
- Ubuntu MAAS Server can manage DHCP for address allocation for
- the provisioned systems. The DHCP requires you to set the
- network mask address for the IP address range. If the Netmask
- address is different from the default (255.255.255.0) you must
- set it here.
-
-Template: maas-dhcp/maas-dhcp-broadcast
-Type: string
-Default: 192.168.1.255
-_Description: Set the Broadcast IP address for the DHCP Network Range:
- Ubuntu MAAS Server can manage DHCP for address allocation for
- the provisioned systems. The DHCP server requires you to set the
- broadcast IP address. If the broadcast IP address is different
- from the default (192.168.1.255), you must set it here.
-
-Template: maas-dhcp/maas-dhcp-interface
-Type: string
-Default: eth0
-_Description: Set the network interface that DHCP should listen on.
- Ubuntu MAAS Server can manage DHCP for address allocation for
- the provisioned systems. The DHCP server requires you to set a network
- interface on which DHCP will serve IP addresses. The default is eth0.
-
-Template: maas-dhcp/maas-dhcp-addr
-Type: string
-Default:
-_Description: The IP address at which nodes can reach the DHCP server
- Ubuntu MAAS Server can manage DHCP for address allocation for
- the provisioned systems. The DHCP server requires you to set an IP
- address at which nodes can reach the DHCP server. If left blank
- then the ip address of the dhcp-interface will be used.

=== renamed file 'debian/maas.apport' => 'debian/maas-region-controller.apport'
=== renamed file 'debian/maas.config' => 'debian/maas-region-controller.config'
--- debian/maas.config	2012-08-28 16:13:25 +0000
+++ debian/maas-region-controller.config	2012-09-28 07:21:21 +0000
@@ -19,8 +19,8 @@
 
 if ([ "$1" = "configure" ] && [ -z "$2" ]); then
 	# Hide maas/dbconfig-install question by setting default.
-	set_question maas/dbconfig-install true
-	set_question maas/pgsql/app-pass ""
+	set_question maas-region-controller/dbconfig-install true
+	set_question maas-region-controller/pgsql/app-pass ""
 
 	# source dbconfig-common shell library, and call the hook function
 	if [ -f /usr/share/dbconfig-common/dpkg/config.pgsql ]; then
@@ -30,7 +30,7 @@
 		dbc_dbuser="maas"
 		dbc_remove="true"
 
-		dbc_go maas $@
+		dbc_go maas-region-controller $@
 	fi
 
 elif [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then

=== renamed file 'debian/maas.dirs' => 'debian/maas-region-controller.dirs'
=== renamed file 'debian/maas.install' => 'debian/maas-region-controller.install'
--- debian/maas.install	2012-09-21 16:00:13 +0000
+++ debian/maas-region-controller.install	2012-09-28 07:21:21 +0000
@@ -1,6 +1,5 @@
 # Install project
 debian/tmp/usr/lib/python*/dist-packages/maas usr/share/maas
-twisted/plugins/maasps.py usr/share/pyshared/twisted/plugins
 
 # Install static files
 debian/tmp/usr/share/maas/web/static
@@ -11,19 +10,12 @@
 # Install MAAS local settings
 debian/tmp/etc/maas/maas_local_settings.py
 
-# Install MAAS local celery settings
-debian/tmp/etc/maas/maas_local_celeryconfig.py
-
 # Install WSGI
 debian/tmp/usr/share/maas/wsgi.py
 
-# Install PSERV, txlongpoll config files
-debian/tmp/etc/maas/pserv.yaml
+# Install txlongpoll config file
 debian/tmp/etc/maas/txlongpoll.yaml
 
-# Install Celery Config
-debian/tmp/etc/maas/celeryconfig.py
-
 # Install maas-import-pxe-files
 debian/tmp/usr/sbin/maas-import-pxe-files
 
@@ -45,8 +37,6 @@
 
 # Install all other stuff
 debian/extras/maas usr/sbin
-debian/extras/maas-provision 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-sudoers etc/sudoers.d

=== renamed file 'debian/maas.links' => 'debian/maas-region-controller.links'
--- debian/maas.links	2012-09-21 16:00:13 +0000
+++ debian/maas-region-controller.links	2012-09-28 07:21:21 +0000
@@ -1,3 +1,1 @@
 etc/maas/maas_local_settings.py usr/share/maas/maas_local_settings.py
-etc/maas/maas_local_celeryconfig.py usr/share/maas/maas_local_celeryconfig.py
-etc/maas/celeryconfig.py usr/share/maas/celeryconfig.py

=== renamed file 'debian/maas.lintian-overrides' => 'debian/maas-region-controller.lintian-overrides'
--- debian/maas.lintian-overrides	2012-04-10 19:26:20 +0000
+++ debian/maas-region-controller.lintian-overrides	2012-09-28 07:21:21 +0000
@@ -1,7 +1,7 @@
-maas: embedded-javascript-library usr/share/maas/web/static/jslibs/yui/3.4.1/build/yui/yui-min.js
-maas: extra-license-file usr/share/maas/web/static/jslibs/yui/3.4.1/docs/assets/panel/vendor/prettify/COPYING
-maas: extra-license-file usr/share/maas/web/static/jslibs/yui/3.4.1/docs/assets/vendor/prettify/COPYING
-maas: script-not-executable usr/share/maas/web/static/jslibs/yui/3.4.1/tests/loader/tests/server/server.js
-maas: unusual-interpreter usr/share/maas/web/static/jslibs/yui/3.4.1/tests/loader/tests/server/server.js #!node
-maas: postinst-uses-db-input
-maas: binary-without-manpage usr/bin/maas
+maas-region-controller: embedded-javascript-library usr/share/maas/web/static/jslibs/yui/3.4.1/build/yui/yui-min.js
+maas-region-controller: extra-license-file usr/share/maas/web/static/jslibs/yui/3.4.1/docs/assets/panel/vendor/prettify/COPYING
+maas-region-controller: extra-license-file usr/share/maas/web/static/jslibs/yui/3.4.1/docs/assets/vendor/prettify/COPYING
+maas-region-controller: script-not-executable usr/share/maas/web/static/jslibs/yui/3.4.1/tests/loader/tests/server/server.js
+maas-region-controller: unusual-interpreter usr/share/maas/web/static/jslibs/yui/3.4.1/tests/loader/tests/server/server.js #!node
+maas-region-controller: postinst-uses-db-input
+maas-region-controller: binary-without-manpage usr/bin/maas

=== renamed file 'debian/maas.logrotate' => 'debian/maas-region-controller.logrotate'
--- debian/maas.logrotate	2012-04-03 16:33:17 +0000
+++ debian/maas-region-controller.logrotate	2012-09-28 07:21:21 +0000
@@ -7,16 +7,6 @@
  #create 620 root www-data
 }
 
-/var/log/maas/pserv.log {
- rotate 5
- weekly
- compress
- missingok
- postrotate
-  [ -r /var/run/maas-pserv.pid ] && kill -s USR2 $(cat /var/run/maas-pserv.pid) || true
- endscript
-}
-
 /var/log/maas/txlongpoll.log {
  rotate 5
  weekly

=== renamed file 'debian/maas.maas-txlongpoll.upstart' => 'debian/maas-region-controller.maas-txlongpoll.upstart'
=== renamed file 'debian/maas.postinst' => 'debian/maas-region-controller.postinst'
--- debian/maas.postinst	2012-09-27 09:46:06 +0000
+++ debian/maas-region-controller.postinst	2012-09-28 07:21:21 +0000
@@ -98,12 +98,6 @@
 		sed -i "s|^BROKER_URL\ \= '.*'$|BROKER_URL = '"$broker_url"'|" \
                        /etc/maas/maas_local_celeryconfig.py
 	fi
-
-	if grep -qs "^CLUSTER_UUID\ \= None$" /etc/maas/maas_local_celeryconfig.py; then
-		local uuid="$(uuidgen)"
-		sed -i "s|^CLUSTER_UUID\ \= None$|CLUSTER_UUID = '"$uuid"'|" \
-                       /etc/maas/maas_local_celeryconfig.py
-	fi
 }
 
 configure_maas_database() {
@@ -230,11 +224,11 @@
 	restart_postgresql
 
 	# Create the database
-	dbc_go maas $@
+	dbc_go maas-region-controller $@
 	configure_maas_database "$dbc_dbpass"
 
 	# Only syncdb if we have selected to install it with dbconfig-common.
-	db_get maas/dbconfig-install
+	db_get maas-region-controller/dbconfig-install
 	if [ "$RET" = "true" ]; then
 		maas_sync_migrate_db
 	fi
@@ -287,7 +281,7 @@
 		# Handle celery/rabbitmq publishing
 		configure_maas_workers_rabbitmq_user
 		# handle database upgrade
-		dbc_go maas $@
+		dbc_go maas-region-controller $@
 		configure_maas_database "$dbc_dbpass"
 	fi
 

=== renamed file 'debian/maas.postrm' => 'debian/maas-region-controller.postrm'
--- debian/maas.postrm	2012-09-21 16:54:02 +0000
+++ debian/maas-region-controller.postrm	2012-09-28 07:21:21 +0000
@@ -7,7 +7,7 @@
 if [ -f /etc/dbconfig-common/maas.conf ]; then
 	if [ -f /usr/share/dbconfig-common/dpkg/postrm ]; then
 		. /usr/share/dbconfig-common/dpkg/postrm.pgsql
-		dbc_go maas $@
+		dbc_go maas-region-controller $@
 	fi
 fi
 

=== renamed file 'debian/maas.prerm' => 'debian/maas-region-controller.prerm'
--- debian/maas.prerm	2012-09-04 16:57:27 +0000
+++ debian/maas-region-controller.prerm	2012-09-28 07:21:21 +0000
@@ -13,6 +13,6 @@
 fi
 
 . /usr/share/dbconfig-common/dpkg/prerm.pgsql
-dbc_go maas $@
+dbc_go maas-region-controller $@
 
 exit 0

=== renamed file 'debian/maas.templates' => 'debian/maas-region-controller.templates'
--- debian/maas.templates	2012-04-17 22:35:30 +0000
+++ debian/maas-region-controller.templates	2012-09-28 07:21:21 +0000
@@ -10,7 +10,7 @@
  If the automatically detected address above is not in the same
  network as the MAAS clients, you need to reconfigure it:
  .
-    sudo dpkg-reconfigure maas
+    sudo dpkg-reconfigure maas-region-controller
 
 Template: maas/default-maas-url
 Type: string

=== removed file 'debian/maas.maas-celery.upstart'
--- debian/maas.maas-celery.upstart	2012-09-26 16:34:47 +0000
+++ debian/maas.maas-celery.upstart	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-# maas-celery - celery daemon
-#
-# MAAS Celery Daemon
-
-description     "MAAS"
-author "Andres Rodriguez <[e-mail]>"
-
-start on filesystem and net-device-up
-stop on runlevel [016]
-
-respawn
-
-setuid maas
-setgid maas
-
-env PYTHONPATH="/usr/share/maas/"
-# To add options to your daemon, edit the line below:
-# NOTE: Config is picked up from PYTHONPATH.
-#       In this case is picked up from /usr/share/maas/celeryconfig.py,
-#       which is a symlink to /etc/maas/celeryconfig.py
-exec /usr/bin/celeryd --logfile=/var/log/maas/celery.log --loglevel=INFO --beat --schedule=/var/lib/maas/celerybeat-schedule -Q celery,master

=== modified file 'debian/python-django-maas.install'
--- debian/python-django-maas.install	2012-03-07 17:38:33 +0000
+++ debian/python-django-maas.install	2012-09-28 07:21:21 +0000
@@ -1,3 +1,2 @@
 debian/tmp/usr/lib/python*/dist-packages/maasserver
 debian/tmp/usr/lib/python*/dist-packages/metadataserver
-debian/tmp/usr/lib/python*/dist-packages/provisioningserver

=== added file 'debian/python-maas-provisioningserver.install'
--- debian/python-maas-provisioningserver.install	1970-01-01 00:00:00 +0000
+++ debian/python-maas-provisioningserver.install	2012-09-28 07:21:21 +0000
@@ -0,0 +1,1 @@
+debian/tmp/usr/lib/python*/dist-packages/provisioningserver