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

[Andres Rodriguez]

Initial packaging changes to support Rack Controllers instead of Cluster Controllers.

[lp:~andreserl/maas/rename_cluster_to_rack_packaging]

444. By Andres Rodriguez on 2016-02-04

update

[Andres Rodriguez (andreserl)]

selfie!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-02-01 17:37:46 +0000
+++ debian/changelog	2016-02-04 10:56:13 +0000
@@ -1,6 +1,7 @@
-maas (2.0.0~alpha1+bzr4622-0ubuntu1) UNRELEASED; urgency=medium
+maas (2.0.0~alpha1+bzr4633-0ubuntu1) UNRELEASED; urgency=medium
 
-  * UNRELEASED
+  * New usptream release:
+  * Rename maas-cluster* to maas-rack*.
 
  -- Andres Rodriguez <[e-mail]>  Mon, 01 Feb 2016 18:18:52 +0100
 

=== modified file 'debian/control'
--- debian/control	2016-02-01 17:40:53 +0000
+++ debian/control	2016-02-04 10:56:13 +0000
@@ -17,7 +17,7 @@
 
 Package: maas
 Architecture: all
-Depends: maas-cluster-controller (= ${binary:Version}),
+Depends: maas-rack-controller (= ${binary:Version}),
          maas-region-controller (= ${binary:Version}),
          python3-django-maas (= ${binary:Version}),
          ${misc:Depends}
@@ -68,8 +68,6 @@
          ubuntu-cloudimage-keyring,
          ${misc:Depends},
          ${python3:Depends}
-Breaks: maas-region-controller ( <= 1.4+bzr1693+dfsg-0ubuntu3 )
-Replaces: maas-region-controller ( <= 1.4+bzr1693+dfsg-0ubuntu3 )
 Description: MAAS Server minimum region controller
  This package installs and configures the minimum region controller
  services provided by MAAS, including the web UI, caching package proxy,
@@ -115,12 +113,6 @@
          iproute2,
          ${misc:Depends},
          ${python3:Depends}
-Breaks: maas-cluster-controller (<= 0.1+bzr1243+dfsg-0ubuntu3),
-        maas-dhcp (<= 1.4+bzr1817+dfsg-0ubuntu1),
-        python-django-maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
-Replaces: maas-cluster-controller (<= 0.1+bzr1243+dfsg-0ubuntu3),
-          maas-dhcp (<= 1.4+bzr1817+dfsg-0ubuntu1),
-          python-django-maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
 Description: MAAS server provisioning libraries (Python 3)
  This package provides the MAAS provisioning server python libraries.
  .
@@ -144,14 +136,14 @@
 Section: python
 Architecture: all
 Depends: python3-oauth, ${misc:Depends}, ${python3:Depends}
-Breaks: maas (<= 0.1+bzr971+dfsg-0ubuntu2 ), python-maas-client
-Replaces: maas (<= 0.1+bzr971+dfsg-0ubuntu2 ), python-maas-client
+Breaks: python-maas-client
+Replaces: python-maas-client
 Description: MAAS python API client (Python 3)
  This package contains the MAAS client API Python modules.
  .
  This package contains Python 3 modules.
 
-Package: maas-cluster-controller
+Package: maas-rack-controller
 Architecture: all
 Depends: authbind,
          bind9utils,
@@ -178,12 +170,10 @@
          ${python3:Depends}
 Suggests: amtterm, ipmitool, libvirt-bin, python3-pyvmomi
 Conflicts: tftpd-hpa
-Breaks: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ),
-        maas-region-controller ( <= 0.1+bzr1314+dfsg-0ubuntu1 ),
-        python-maas-provisioningserver
-Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ),
-          maas-region-controller ( <= 0.1+bzr1314+dfsg-0ubuntu1 ),
-          python-maas-provisioningserver
+Breaks: python-maas-provisioningserver,
+        maas-cluster-controller
+Replaces: python-maas-provisioningserver,
+          maas-cluster-controller
 Description: MAAS server cluster controller
  This package contains the MAAS cluster controller, which is responsible
  for enabling and controlling remote DHCP/TFTP instances on their own
@@ -216,8 +206,6 @@
 Package: maas-dhcp
 Architecture: all
 Depends: isc-dhcp-server (>= 4.2.4), ${misc:Depends}
-Breaks: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
-Replaces: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
 Description: MAAS DHCP server
  This package installs and configures a DHCP server that can be used by
  MAAS, and enhances the overall MAAS user experience.
@@ -228,8 +216,6 @@
          maas-region-controller-min (= ${binary:Version}),
          ${misc:Depends}
 Conflicts: dnsmasq
-Breaks: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
-Replaces: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
 Description: MAAS DNS server
  This package installs and configures a DNS server that can be used by
  MAAS, and enhances the overall MAAS user experience.

=== removed file 'debian/maas-cluster-controller.config'
--- debian/maas-cluster-controller.config	2015-07-08 19:47:45 +0000
+++ debian/maas-cluster-controller.config	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-set -e
-
-. /usr/share/debconf/confmodule
-db_version 2.0
-
-# Only ask for new installations and reconfiguring.
-# XXX Fix to not ask when installing from the CD.
-if ([ "$1" = "configure" ] && [ -z "$2" ]); then
-
-    db_get maas-cluster-controller/maas-url || true
-    if [ -z "$RET" ]; then
-        # Attempt to pre-populate if installing on the region controller.
-        if [ -f /usr/sbin/maas-region-admin ]; then
-            url=$(maas-region-admin local_config_get --maas-url --plain)
-            # 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
-            # /etc/maas/regiond.conf doesn't exist.
-            db_input medium maas-cluster-controller/maas-url || true
-            db_go
-        fi
-    fi
-fi
-
-if [ "$1" = "reconfigure" ]; then
-    db_input high maas-cluster-controller/maas-url || true
-    db_go
-fi
-#DEBHELPER#

=== removed file 'debian/maas-cluster-controller.dirs'
--- debian/maas-cluster-controller.dirs	2014-04-03 17:51:04 +0000
+++ debian/maas-cluster-controller.dirs	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-etc/maas
-var/lib/maas/boot-resources

=== removed file 'debian/maas-cluster-controller.install'
--- debian/maas-cluster-controller.install	2015-12-20 21:21:02 +0000
+++ debian/maas-cluster-controller.install	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-# Install templates
-debian/tmp/etc/maas/templates/dhcp
-debian/tmp/etc/maas/templates/power
-debian/tmp/etc/maas/templates/pxe
-debian/tmp/etc/maas/templates/uefi
-
-# Install uec2roottar
-debian/tmp/usr/bin/uec2roottar
-
-# Install all other stuff
-debian/extras/99-maas-sudoers etc/sudoers.d
-debian/extras/isc-dhcp-server.override etc/init
-debian/extras/maas-probe-dhcp usr/sbin
-debian/extras/maas-provision usr/sbin

=== removed file 'debian/maas-cluster-controller.lintian-overrides'
--- debian/maas-cluster-controller.lintian-overrides	2014-03-27 04:49:52 +0000
+++ debian/maas-cluster-controller.lintian-overrides	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-maas-cluster-controller: binary-without-manpage usr/bin/uec2roottar

=== removed file 'debian/maas-cluster-controller.logrotate'
--- debian/maas-cluster-controller.logrotate	2015-01-22 21:58:00 +0000
+++ debian/maas-cluster-controller.logrotate	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-/var/log/maas/clusterd.log {
- rotate 5
- weekly
- compress
- missingok
- # copytruncate may lose log messages at the moment of rotation, but
- # there is no better way to integrate twistd and logrotate.
- copytruncate
- # The logs are all owned by the `maas` user, so drop privs.
- su maas maas
- # Don't rotate unless the log is at least 10MB.
- minsize 10M
- # Force rotation if the log grows beyond 50MB.
- maxsize 50M
-}

=== removed file 'debian/maas-cluster-controller.maas-clusterd.service'
--- debian/maas-cluster-controller.maas-clusterd.service	2015-12-09 02:18:13 +0000
+++ debian/maas-cluster-controller.maas-clusterd.service	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-[Unit]
-Description=MAAS Cluster Controller
-Documentation=https://maas.ubuntu.com/
-Requires=network-online.target
-After=network-online.target
-
-[Service]
-User=maas
-Group=maas
-Restart=always
-RestartSec=10s
-Environment="LOGFILE=/var/log/maas/clusterd.log"
-# Logs go to the journal; read them with
-#   journalctl -u maas-clusterd
-# Logs also go to $LOGFILE for backward compatibility. The journal
-# should now be preferred as the $LOGFILE will be removed in MAAS 1.9.
-ExecStart=/bin/sh -c \
-    'exec /usr/bin/authbind --deep /usr/bin/twistd3 --nodaemon --pidfile= \
-     maas-clusterd 2>&1 | tee -a $LOGFILE'
-
-[Install]
-WantedBy=multi-user.target

=== removed file 'debian/maas-cluster-controller.maintscript'
--- debian/maas-cluster-controller.maintscript	2015-08-26 11:42:17 +0000
+++ debian/maas-cluster-controller.maintscript	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-rm_conffile /etc/maas/bootresources.yaml 1.7.0~beta1+bzr2781-0ubuntu1
-rm_conffile /etc/maas/maas_local_celeryconfig_cluster.py 1.7.0~beta3+bzr3043-0ubuntu1
-rm_conffile /etc/init/maas-cluster-celery.conf 1.7.0~beta3+bzr3043-0ubuntu1
-rm_conffile /etc/init/maas-pserv.conf 1.7.0~beta3+bzr3043-0ubuntu1
-rm_conffile /etc/init/maas-cluster.conf 1.7.0~beta6+bzr3231-0ubuntu1
-rm_conffile /etc/init/maas-cluster-register.conf 1.7.0~beta6+bzr3231-0ubuntu1
-rm_conffile /etc/maas/maas-cluster-http.conf 1.8.0~alpha1+bzr3522-0ubuntu1
-rm_conffile /etc/maas/templates/power/apc.template 1.9.0~alpha1+bzr4184-0ubuntu1
-rm_conffile /etc/maas/templates/power/mscm.template 1.9.0~alpha1+bzr4184-0ubuntu1
-rm_conffile /etc/maas/templates/power/msftocs.template 1.9.0~alpha1+bzr4184-0ubuntu1
-rm_conffile /etc/maas/templates/power/sm15k.template 1.9.0~alpha1+bzr4184-0ubuntu1
-rm_conffile /etc/maas/templates/power/ucsm.template 1.9.0~alpha1+bzr4184-0ubuntu1
-rm_conffile /etc/maas/templates/power/virsh.template 1.9.0~alpha1+bzr4184-0ubuntu1
-rm_conffile /etc/maas/templates/power/vmware.template 1.9.0~alpha1+bzr4184-0ubuntu1
-rm_conffile /etc/maas/templates/power/ipmi.conf 1.9.0~alpha1+bzr4221-0ubuntu1
-rm_conffile /etc/maas/templates/power/ipmi.template 1.9.0~alpha1+bzr4221-0ubuntu1

=== removed file 'debian/maas-cluster-controller.postinst'
--- debian/maas-cluster-controller.postinst	2015-08-08 10:51:15 +0000
+++ debian/maas-cluster-controller.postinst	1970-01-01 00:00:00 +0000
@@ -1,125 +0,0 @@
-#!/bin/sh
-
-set -e
-
-. /usr/share/debconf/confmodule
-db_version 2.0
-
-RELEASE=`lsb_release -rs` || RELEASE=""
-
-create_var_dir() {
-    # create var dir
-    if [ ! -d /var/lib/maas ]; then
-        mkdir -p /var/lib/maas
-    fi
-    chown -R maas:maas /var/lib/maas/
-
-}
-create_log_dir() {
-    # Give appropriate permissions
-    if [ ! -f /var/log/maas/clusterd.log ]; then
-        touch /var/log/maas/clusterd.log
-    fi
-    chown maas:maas /var/log/maas/clusterd.log
-}
-
-configure_maas_tgt() {
-    # Ensure that iSCSI targets get re-defined on reboot.
-    # Creates a softlink in /etc/tgt/conf.d/ that points to the current
-    # boot images' tgt configuration.
-    mkdir -p /etc/tgt/conf.d
-    ln -sf /var/lib/maas/boot-resources/current/maas.tgt /etc/tgt/conf.d/maas.conf
-}
-
-extract_cluster_uuid(){
-    # Extract ClUSTER_UUID setting from config file $1. This will work
-    # on the old the cluster config file (which is shell).
-    awk '{ split($1,array,"\"")} END{print array[2] }' "$1"
-}
-
-extract_maas_url(){
-    # Extract the MAAS_URL setting from the config file $1.
-    grep -Eo "https?://[^ ]+" "$1" | cut -d"\"" -f1
-}
-
-configure_cluster_uuid(){
-    # This will configure a UUID if one has not previously been set.
-    maas-provision config --init
-}
-
-configure_cluster_authbind() {
-    MAAS_UID="`id -u maas`"
-    if [ ! -f "/etc/authbind/byuid/$MAAS_UID" ]; then
-        if [ ! -d "/etc/authbind/byuid" ]; then
-            mkdir -p /etc/authbind/byuid
-            chmod 755 /etc/authbind
-            chmod 755 /etc/authbind/byuid
-        fi
-    fi
-    echo '0.0.0.0/0:68,69' >/etc/authbind/byuid/$MAAS_UID
-    echo '::/0,68-69' >>/etc/authbind/byuid/$MAAS_UID
-    chown maas:maas /etc/authbind/byuid/$MAAS_UID
-    chmod 700 /etc/authbind/byuid/$MAAS_UID
-}
-
-configure_maas_url(){
-    # Get the MAAS URL on configure/reconfigure and write it to the conf files.
-    db_get maas-cluster-controller/maas-url || true
-    if [ -n "$RET" ]; then
-        maas-provision config --region-url "$RET"
-    fi
-}
-
-configure_shared_secret() {
-    db_get maas-cluster-controller/shared-secret || true
-    if [ -n "$RET" ]; then
-        echo "$RET" | maas-provision install-shared-secret
-        chown maas:maas /var/lib/maas/secret
-        chmod 0640 /var/lib/maas/secret
-    fi
-}
-
-# Unconditionally ensure that there is at least an empty configuration
-# file. This does *not* overwrite any existing configuration.
-maas-provision config
-
-if [ "$1" = "configure" ] && [ -z "$2" ]; then
-    create_log_dir
-    create_var_dir
-    configure_maas_tgt
-    configure_maas_url
-    configure_cluster_uuid
-    configure_cluster_authbind
-    maas-provision upgrade-cluster
-
-elif [ -n "$DEBCONF_RECONFIGURE" ]; then
-    configure_maas_url
-    # Only ask for a shared secret when the region is not installed
-    # on the same system.
-    if [ ! -f /usr/sbin/maas-region-admin ]; then
-        db_input high maas-cluster-controller/shared-secret
-        db_go
-    fi
-    configure_shared_secret
-
-elif [ "$1" = "configure" ] && dpkg --compare-versions "$2" gt 0.1+bzr266+dfsg-0ubuntu1; then
-    # If we are upgrading from an older version, then we need to obtain
-    # the cluster UUID from the old configuration file and set it with
-    # the new configuration tool.
-    if [ -f /etc/maas/maas_cluster.conf ]; then
-        uuid=$(extract_cluster_uuid /etc/maas/maas_cluster.conf)
-        maas-provision config --uuid "$uuid"
-        maas_url=$(extract_maas_url /etc/maas/maas_cluster.conf)
-        maas-provision config --region-url "$maas_url"
-        db_set maas-cluster-controller/maas-url "$maas_url"
-        mv /etc/maas/maas_cluster.conf /etc/maas/maas_cluster.conf.maas-old
-        mv /etc/maas/pserv.yaml /etc/maas/pserv.yaml.maas-old
-    fi
-
-    configure_cluster_authbind
-    maas-provision upgrade-cluster
-fi
-
-db_stop
-
-#DEBHELPER#

=== removed file 'debian/maas-cluster-controller.postrm'
--- debian/maas-cluster-controller.postrm	2015-07-03 14:26:39 +0000
+++ debian/maas-cluster-controller.postrm	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#DEBHELPER#
-
-RELEASE=`lsb_release -rs` || RELEASE=""
-
-case "$1" in
-    purge)
-        # remove log directory
-        rm -rf /var/log/maas
-        # remove var directory
-        DIR=/var/lib/maas
-        if [ "$(ls -A $DIR 2> /dev/null)" = "" ]; then
-            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
-
-        # Remove authbind
-        MAAS_UID="`id -u maas`"
-        if [ -f "/etc/authbind/byuid/$MAAS_UID" ]; then
-            rm -rf /etc/authbind/byuid/$MAAS_UID
-        fi
-
-        # Deleting old/new config files
-        rm -rf /etc/maas/pserv.yaml.maas-old
-        rm -rf /etc/maas/maas_cluster.conf.maas-old
-        rm -rf /etc/maas/clusterd.conf
-
-esac

=== removed file 'debian/maas-cluster-controller.preinst'
--- debian/maas-cluster-controller.preinst	2015-02-18 04:09:08 +0000
+++ debian/maas-cluster-controller.preinst	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-#!/bin/sh
-
-set -e
-
-. /usr/share/debconf/confmodule
-
-if [ "$1" = "upgrade" ]; then
-
-    if dpkg --compare-versions "$2" lt 1.7.0~beta3+bzr3066-0ubuntu1; then
-        if [ -f /etc/init/maas-pserv.conf ]; then
-            invoke-rc.d maas-pserv stop
-        fi
-
-        if [ -f /etc/init/maas-cluster-celery.conf ]; then
-            invoke-rc.d maas-cluster-celery stop
-        fi
-
-        if [ -f /var/log/maas/celery.log ]; then
-            rm -rf /var/log/maas/celery.log
-        fi
-    fi
-
-    if dpkg --compare-versions "$2" lt 1.7.0~beta6+bzr3232-0ubuntu1; then
-        if [ -f /etc/init/maas-cluster.conf ]; then
-            invoke-rc.d maas-cluster stop
-        fi
-    fi
-
-    if dpkg --compare-versions "$2" lt 1.8.0~alpha1+bzr3486-0ubuntu1; then
-        if [ -f /var/log/maas/pserv.log ]; then
-            rm -rf /var/log/maas/pserv.log
-        fi
-    fi
-
-    if dpkg --compare-versions "$2" lt 1.8.0~alpha1+bzr3523-0ubuntu1; then
-        if [ -f /etc/apache2/conf-enabled/maas-cluster-http.conf ]; then
-            rm -rf /etc/apache2/conf-enabled/maas-cluster-http.conf
-        fi
-    fi
-
-fi
-
-#DEBHELPER#

=== removed file 'debian/maas-cluster-controller.templates'
--- debian/maas-cluster-controller.templates	2014-10-14 06:55:35 +0000
+++ debian/maas-cluster-controller.templates	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-Template: maas-cluster-controller/maas-url
-Type: string
-Default:
-_Description: Ubuntu MAAS API address:
- The MAAS cluster controller and nodes need to contact the MAAS region
- controller API.  Set the URL at which they can reach the MAAS API remotely,
- e.g. "http://192.168.1.1/MAAS".
- Since nodes must be able to access this URL, localhost or 127.0.0.1 are not
- useful values here.
-
-Template: maas-cluster-controller/shared-secret
-Type: password
-Default:
-_Description: MAAS Cluster Controller Shared Secret:
- The MAAS Cluster Controller needs to contact the MAAS server
- with a share secret. Set the shared secret here.

=== added file 'debian/maas-rack-controller.config'
--- debian/maas-rack-controller.config	1970-01-01 00:00:00 +0000
+++ debian/maas-rack-controller.config	2016-02-04 10:56:13 +0000
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+db_version 2.0
+
+# Only ask for new installations and reconfiguring.
+# XXX Fix to not ask when installing from the CD.
+if ([ "$1" = "configure" ] && [ -z "$2" ]); then
+
+    db_get maas-rack-controller/maas-url || true
+    if [ -z "$RET" ]; then
+        # Attempt to pre-populate if installing on the region controller.
+        if [ -f /usr/sbin/maas-region-admin ]; then
+            url=$(maas-region-admin local_config_get --maas-url --plain)
+            # 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-rack-controller/maas-url "$url"
+        else
+            # Will only get here if dbconf value not already set, or
+            # /etc/maas/regiond.conf doesn't exist.
+            db_input medium maas-rack-controller/maas-url || true
+            db_go
+        fi
+    fi
+fi
+
+if [ "$1" = "reconfigure" ]; then
+    db_input high maas-rack-controller/maas-url || true
+    db_go
+fi
+#DEBHELPER#

=== added file 'debian/maas-rack-controller.dirs'
--- debian/maas-rack-controller.dirs	1970-01-01 00:00:00 +0000
+++ debian/maas-rack-controller.dirs	2016-02-04 10:56:13 +0000
@@ -0,0 +1,2 @@
+etc/maas
+var/lib/maas/boot-resources

=== added file 'debian/maas-rack-controller.install'
--- debian/maas-rack-controller.install	1970-01-01 00:00:00 +0000
+++ debian/maas-rack-controller.install	2016-02-04 10:56:13 +0000
@@ -0,0 +1,14 @@
+# Install templates
+debian/tmp/etc/maas/templates/dhcp
+debian/tmp/etc/maas/templates/power
+debian/tmp/etc/maas/templates/pxe
+debian/tmp/etc/maas/templates/uefi
+
+# Install uec2roottar
+debian/tmp/usr/bin/uec2roottar
+
+# Install all other stuff
+debian/extras/99-maas-sudoers etc/sudoers.d
+debian/extras/isc-dhcp-server.override etc/init
+debian/extras/maas-probe-dhcp usr/sbin
+debian/extras/maas-provision usr/sbin

=== added file 'debian/maas-rack-controller.lintian-overrides'
--- debian/maas-rack-controller.lintian-overrides	1970-01-01 00:00:00 +0000
+++ debian/maas-rack-controller.lintian-overrides	2016-02-04 10:56:13 +0000
@@ -0,0 +1,1 @@
+maas-rack-controller: binary-without-manpage usr/bin/uec2roottar

=== added file 'debian/maas-rack-controller.logrotate'
--- debian/maas-rack-controller.logrotate	1970-01-01 00:00:00 +0000
+++ debian/maas-rack-controller.logrotate	2016-02-04 10:56:13 +0000
@@ -0,0 +1,15 @@
+/var/log/maas/rackd.log {
+ rotate 5
+ weekly
+ compress
+ missingok
+ # copytruncate may lose log messages at the moment of rotation, but
+ # there is no better way to integrate twistd and logrotate.
+ copytruncate
+ # The logs are all owned by the `maas` user, so drop privs.
+ su maas maas
+ # Don't rotate unless the log is at least 10MB.
+ minsize 10M
+ # Force rotation if the log grows beyond 50MB.
+ maxsize 50M
+}

=== added file 'debian/maas-rack-controller.maas-rackd.service'
--- debian/maas-rack-controller.maas-rackd.service	1970-01-01 00:00:00 +0000
+++ debian/maas-rack-controller.maas-rackd.service	2016-02-04 10:56:13 +0000
@@ -0,0 +1,22 @@
+[Unit]
+Description=MAAS Cluster Controller
+Documentation=https://maas.ubuntu.com/
+Requires=network-online.target
+After=network-online.target
+
+[Service]
+User=maas
+Group=maas
+Restart=always
+RestartSec=10s
+Environment="LOGFILE=/var/log/maas/rackd.log"
+# Logs go to the journal; read them with
+#   journalctl -u maas-rackd
+# Logs also go to $LOGFILE for backward compatibility. The journal
+# should now be preferred as the $LOGFILE will be removed in MAAS 1.9.
+ExecStart=/bin/sh -c \
+    'exec /usr/bin/authbind --deep /usr/bin/twistd3 --nodaemon --pidfile= \
+     maas-rackd 2>&1 | tee -a $LOGFILE'
+
+[Install]
+WantedBy=multi-user.target

=== added file 'debian/maas-rack-controller.maintscript'
--- debian/maas-rack-controller.maintscript	1970-01-01 00:00:00 +0000
+++ debian/maas-rack-controller.maintscript	2016-02-04 10:56:13 +0000
@@ -0,0 +1,16 @@
+rm_conffile /etc/maas/bootresources.yaml 1.7.0~beta1+bzr2781-0ubuntu1
+rm_conffile /etc/maas/maas_local_celeryconfig_cluster.py 1.7.0~beta3+bzr3043-0ubuntu1
+rm_conffile /etc/init/maas-cluster-celery.conf 1.7.0~beta3+bzr3043-0ubuntu1
+rm_conffile /etc/init/maas-pserv.conf 1.7.0~beta3+bzr3043-0ubuntu1
+rm_conffile /etc/init/maas-cluster.conf 1.7.0~beta6+bzr3231-0ubuntu1
+rm_conffile /etc/init/maas-cluster-register.conf 1.7.0~beta6+bzr3231-0ubuntu1
+rm_conffile /etc/maas/maas-cluster-http.conf 1.8.0~alpha1+bzr3522-0ubuntu1
+rm_conffile /etc/maas/templates/power/apc.template 1.9.0~alpha1+bzr4184-0ubuntu1
+rm_conffile /etc/maas/templates/power/mscm.template 1.9.0~alpha1+bzr4184-0ubuntu1
+rm_conffile /etc/maas/templates/power/msftocs.template 1.9.0~alpha1+bzr4184-0ubuntu1
+rm_conffile /etc/maas/templates/power/sm15k.template 1.9.0~alpha1+bzr4184-0ubuntu1
+rm_conffile /etc/maas/templates/power/ucsm.template 1.9.0~alpha1+bzr4184-0ubuntu1
+rm_conffile /etc/maas/templates/power/virsh.template 1.9.0~alpha1+bzr4184-0ubuntu1
+rm_conffile /etc/maas/templates/power/vmware.template 1.9.0~alpha1+bzr4184-0ubuntu1
+rm_conffile /etc/maas/templates/power/ipmi.conf 1.9.0~alpha1+bzr4221-0ubuntu1
+rm_conffile /etc/maas/templates/power/ipmi.template 1.9.0~alpha1+bzr4221-0ubuntu1

=== added file 'debian/maas-rack-controller.postinst'
--- debian/maas-rack-controller.postinst	1970-01-01 00:00:00 +0000
+++ debian/maas-rack-controller.postinst	2016-02-04 10:56:13 +0000
@@ -0,0 +1,125 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+db_version 2.0
+
+RELEASE=`lsb_release -rs` || RELEASE=""
+
+create_var_dir() {
+    # create var dir
+    if [ ! -d /var/lib/maas ]; then
+        mkdir -p /var/lib/maas
+    fi
+    chown -R maas:maas /var/lib/maas/
+
+}
+create_log_dir() {
+    # Give appropriate permissions
+    if [ ! -f /var/log/maas/rackd.log ]; then
+        touch /var/log/maas/rackd.log
+    fi
+    chown maas:maas /var/log/maas/rackd.log
+}
+
+configure_maas_tgt() {
+    # Ensure that iSCSI targets get re-defined on reboot.
+    # Creates a softlink in /etc/tgt/conf.d/ that points to the current
+    # boot images' tgt configuration.
+    mkdir -p /etc/tgt/conf.d
+    ln -sf /var/lib/maas/boot-resources/current/maas.tgt /etc/tgt/conf.d/maas.conf
+}
+
+extract_cluster_uuid(){
+    # Extract ClUSTER_UUID setting from config file $1. This will work
+    # on the old the cluster config file (which is shell).
+    awk '{ split($1,array,"\"")} END{print array[2] }' "$1"
+}
+
+extract_maas_url(){
+    # Extract the MAAS_URL setting from the config file $1.
+    grep -Eo "https?://[^ ]+" "$1" | cut -d"\"" -f1
+}
+
+configure_cluster_uuid(){
+    # This will configure a UUID if one has not previously been set.
+    maas-provision config --init
+}
+
+configure_cluster_authbind() {
+    MAAS_UID="`id -u maas`"
+    if [ ! -f "/etc/authbind/byuid/$MAAS_UID" ]; then
+        if [ ! -d "/etc/authbind/byuid" ]; then
+            mkdir -p /etc/authbind/byuid
+            chmod 755 /etc/authbind
+            chmod 755 /etc/authbind/byuid
+        fi
+    fi
+    echo '0.0.0.0/0:68,69' >/etc/authbind/byuid/$MAAS_UID
+    echo '::/0,68-69' >>/etc/authbind/byuid/$MAAS_UID
+    chown maas:maas /etc/authbind/byuid/$MAAS_UID
+    chmod 700 /etc/authbind/byuid/$MAAS_UID
+}
+
+configure_maas_url(){
+    # Get the MAAS URL on configure/reconfigure and write it to the conf files.
+    db_get maas-rack-controller/maas-url || true
+    if [ -n "$RET" ]; then
+        maas-provision config --region-url "$RET"
+    fi
+}
+
+configure_shared_secret() {
+    db_get maas-rack-controller/shared-secret || true
+    if [ -n "$RET" ]; then
+        echo "$RET" | maas-provision install-shared-secret
+        chown maas:maas /var/lib/maas/secret
+        chmod 0640 /var/lib/maas/secret
+    fi
+}
+
+# Unconditionally ensure that there is at least an empty configuration
+# file. This does *not* overwrite any existing configuration.
+maas-provision config
+
+if [ "$1" = "configure" ] && [ -z "$2" ]; then
+    create_log_dir
+    create_var_dir
+    configure_maas_tgt
+    configure_maas_url
+    configure_cluster_uuid
+    configure_cluster_authbind
+    maas-provision upgrade-cluster
+
+elif [ -n "$DEBCONF_RECONFIGURE" ]; then
+    configure_maas_url
+    # Only ask for a shared secret when the region is not installed
+    # on the same system.
+    if [ ! -f /usr/sbin/maas-region-admin ]; then
+        db_input high maas-rack-controller/shared-secret
+        db_go
+    fi
+    configure_shared_secret
+
+elif [ "$1" = "configure" ] && dpkg --compare-versions "$2" gt 0.1+bzr266+dfsg-0ubuntu1; then
+    # If we are upgrading from an older version, then we need to obtain
+    # the cluster UUID from the old configuration file and set it with
+    # the new configuration tool.
+    if [ -f /etc/maas/maas_cluster.conf ]; then
+        uuid=$(extract_cluster_uuid /etc/maas/maas_cluster.conf)
+        maas-provision config --uuid "$uuid"
+        maas_url=$(extract_maas_url /etc/maas/maas_cluster.conf)
+        maas-provision config --region-url "$maas_url"
+        db_set maas-rack-controller/maas-url "$maas_url"
+        mv /etc/maas/maas_cluster.conf /etc/maas/maas_cluster.conf.maas-old
+        mv /etc/maas/pserv.yaml /etc/maas/pserv.yaml.maas-old
+    fi
+
+    configure_cluster_authbind
+    maas-provision upgrade-cluster
+fi
+
+db_stop
+
+#DEBHELPER#

=== added file 'debian/maas-rack-controller.postrm'
--- debian/maas-rack-controller.postrm	1970-01-01 00:00:00 +0000
+++ debian/maas-rack-controller.postrm	2016-02-04 10:56:13 +0000
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+
+RELEASE=`lsb_release -rs` || RELEASE=""
+
+case "$1" in
+    purge)
+        # remove log directory
+        rm -rf /var/log/maas
+        # remove var directory
+        DIR=/var/lib/maas
+        if [ "$(ls -A $DIR 2> /dev/null)" = "" ]; then
+            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
+
+        # Remove authbind
+        MAAS_UID="`id -u maas`"
+        if [ -f "/etc/authbind/byuid/$MAAS_UID" ]; then
+            rm -rf /etc/authbind/byuid/$MAAS_UID
+        fi
+
+        # Deleting old/new config files
+        rm -rf /etc/maas/pserv.yaml.maas-old
+        rm -rf /etc/maas/maas_cluster.conf.maas-old
+        rm -rf /etc/maas/rackd.conf
+
+esac

=== added file 'debian/maas-rack-controller.preinst'
--- debian/maas-rack-controller.preinst	1970-01-01 00:00:00 +0000
+++ debian/maas-rack-controller.preinst	2016-02-04 10:56:13 +0000
@@ -0,0 +1,43 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+if [ "$1" = "upgrade" ]; then
+
+    if dpkg --compare-versions "$2" lt 1.7.0~beta3+bzr3066-0ubuntu1; then
+        if [ -f /etc/init/maas-pserv.conf ]; then
+            invoke-rc.d maas-pserv stop
+        fi
+
+        if [ -f /etc/init/maas-cluster-celery.conf ]; then
+            invoke-rc.d maas-cluster-celery stop
+        fi
+
+        if [ -f /var/log/maas/celery.log ]; then
+            rm -rf /var/log/maas/celery.log
+        fi
+    fi
+
+    if dpkg --compare-versions "$2" lt 1.7.0~beta6+bzr3232-0ubuntu1; then
+        if [ -f /etc/init/maas-cluster.conf ]; then
+            invoke-rc.d maas-cluster stop
+        fi
+    fi
+
+    if dpkg --compare-versions "$2" lt 1.8.0~alpha1+bzr3486-0ubuntu1; then
+        if [ -f /var/log/maas/pserv.log ]; then
+            rm -rf /var/log/maas/pserv.log
+        fi
+    fi
+
+    if dpkg --compare-versions "$2" lt 1.8.0~alpha1+bzr3523-0ubuntu1; then
+        if [ -f /etc/apache2/conf-enabled/maas-cluster-http.conf ]; then
+            rm -rf /etc/apache2/conf-enabled/maas-cluster-http.conf
+        fi
+    fi
+
+fi
+
+#DEBHELPER#

=== added file 'debian/maas-rack-controller.templates'
--- debian/maas-rack-controller.templates	1970-01-01 00:00:00 +0000
+++ debian/maas-rack-controller.templates	2016-02-04 10:56:13 +0000
@@ -0,0 +1,16 @@
+Template: maas-rack-controller/maas-url
+Type: string
+Default:
+_Description: Ubuntu MAAS API address:
+ The MAAS cluster controller and nodes need to contact the MAAS region
+ controller API.  Set the URL at which they can reach the MAAS API remotely,
+ e.g. "http://192.168.1.1/MAAS".
+ Since nodes must be able to access this URL, localhost or 127.0.0.1 are not
+ useful values here.
+
+Template: maas-rack-controller/shared-secret
+Type: password
+Default:
+_Description: MAAS Cluster Controller Shared Secret:
+ The MAAS Cluster Controller needs to contact the MAAS server
+ with a share secret. Set the shared secret here.

=== modified file 'debian/maas-region-controller-min.apport'
--- debian/maas-region-controller-min.apport	2015-06-29 16:46:29 +0000
+++ debian/maas-region-controller-min.apport	2016-02-04 10:56:13 +0000
@@ -36,7 +36,7 @@
 
 def add_info(report, ui):
     response = ui.yesno(
-        "The contents of /etc/maas/regiond.conf and /etc/maas/clusterd.conf "
+        "The contents of /etc/maas/regiond.conf and /etc/maas/rackd.conf "
         "may help developers diagnose your bug more quickly. However, it may "
         "contain sensitive information. Do you want to include it in your bug "
         "report?")
@@ -50,7 +50,7 @@
         attach_file_if_exists(
             report, '/etc/maas/regiond.conf', 'MAASRegionConfig')
         attach_file_if_exists(
-            report, '/etc/maas/clusterd.conf', 'MAASClusterConfig')
+            report, '/etc/maas/rackd.conf', 'MAASClusterConfig')
     else:
         # The user declined to include the configuration files.
         pass
@@ -59,14 +59,14 @@
     attach_file_if_exists(
         report, '/var/log/maas/regiond.log', 'MAASRegionLog')
     attach_file_if_exists(
-        report, '/var/log/maas/clusterd.log', 'MAASClusterLog')
+        report, '/var/log/maas/rackd.log', 'MAASClusterLog')
 
     # Attaching log files (systemd). These will overwrite the logs above on a
     # system where systemd is available.
     attach_journal_logs(
         report, "MAASRegionLog", "maas-regiond", "maas-regiond-worker@*")
     attach_journal_logs(
-        report, "MAASClusterLog", "maas-clusterd")
+        report, "MAASClusterLog", "maas-rackd")
 
     # Attaching related packages info
     attach_related_packages(report, ['python-django-maas', 'apparmor'])

=== modified file 'debian/maas-region-controller.postinst'
--- debian/maas-region-controller.postinst	2015-11-25 17:34:18 +0000
+++ debian/maas-region-controller.postinst	2016-02-04 10:56:13 +0000
@@ -151,8 +151,8 @@
 invoke-rc.d maas-regiond restart || true
 invoke-rc.d apache2 restart || true
 
-if [ -f /etc/init/maas-clusterd.conf ]; then
-    invoke-rc.d maas-clusterd restart || true
+if [ -f /etc/init/maas-rackd.conf ]; then
+    invoke-rc.d maas-rackd restart || true
 fi
 
 db_stop

=== removed file 'debian/python-django-maas.install'
--- debian/python-django-maas.install	2015-12-06 00:08:06 +0000
+++ debian/python-django-maas.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-debian/tmp/usr/lib/python2*/dist-packages/maasserver
-debian/tmp/usr/lib/python2*/dist-packages/metadataserver

=== removed file 'debian/python-maas-client.install'
--- debian/python-maas-client.install	2015-12-06 00:08:06 +0000
+++ debian/python-maas-client.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-debian/tmp/usr/lib/python2*/dist-packages/apiclient

=== removed file 'debian/python-maas-provisioningserver.install'
--- debian/python-maas-provisioningserver.install	2015-12-06 00:08:06 +0000
+++ debian/python-maas-provisioningserver.install	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-# Install other stuff
-debian/extras/maas-probe-dhcp usr/sbin
-debian/extras/maas-provision usr/sbin
-debian/tmp/usr/lib/python2*/dist-packages/provisioningserver

=== removed file 'debian/python-maas-provisioningserver.lintian-overrides'
--- debian/python-maas-provisioningserver.lintian-overrides	2014-01-15 09:48:10 +0000
+++ debian/python-maas-provisioningserver.lintian-overrides	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-python-maas-provisioningserver: binary-without-manpage usr/sbin/maas-provision
-python-maas-provisioningserver: binary-without-manpage usr/sbin/maas-probe-dhcp

=== modified file 'debian/rules'
--- debian/rules	2016-02-01 13:12:49 +0000
+++ debian/rules	2016-02-04 10:56:13 +0000
@@ -15,14 +15,14 @@
 override_dh_installinit:
 	dh_installinit --name=maas-regiond --no-start
 	dh_installinit --name=maas-regiond-worker@  --no-start
-	dh_installinit --name=maas-clusterd
+	dh_installinit --name=maas-rackd
 	dh_installinit --name=maas-dhcpd
 	dh_installinit --name=maas-dhcpd6
 	dh_installinit --name=maas-proxy
 
 override_dh_systemd_start:
 	dh_systemd_start -p maas-region-controller-min --no-start maas-regiond.service
-	dh_systemd_start -p maas-cluster-controller maas-clusterd.service
+	dh_systemd_start -p maas-rack-controller maas-rackd.service
 	dh_systemd_start -p maas-dhcpd maas-dhcpd.service
 	dh_systemd_start -p maas-dhcpd6 maas-dhcpd6.service
 	dh_systemd_start -p maas-proxy maas-proxy.service
@@ -57,7 +57,7 @@
 	# install python3 twisted plugins
 	set -ex; for python in $(PYTHON3); do \
 		dh_install twisted/plugins/maasregiond.py usr/lib/$$python/dist-packages/twisted/plugins -pmaas-region-controller-min; \
-		dh_install twisted/plugins/maasclusterd.py usr/lib/$$python/dist-packages/twisted/plugins -pmaas-cluster-controller; \
+		dh_install twisted/plugins/maasrackd.py usr/lib/$$python/dist-packages/twisted/plugins -pmaas-rack-controller; \
 	done
 
 	dh_install --list-missing