Merge lp:~andreserl/maas/packaging_to-daemon into lp:~maas-maintainers/maas/packaging

[Andres Rodriguez]

Unmerged revisions

510. By Andres Rodriguez on 2016-08-02

* New upstream release, 2.0.0 RC4 bzr :
  - Rename MAAS Rack Controller to MAAS Relay.
* debian/*: update all packaging to replace anything that references
  maas-rack to maas-relay.

=== modified file 'debian/changelog'
--- debian/changelog	2016-07-28 02:27:13 +0000
+++ debian/changelog	2016-08-02 23:56:26 +0000
@@ -1,6 +1,9 @@
 maas (2.0.0~rc4+bzr5180-0ubuntu1) UNRELEASED; urgency=medium
 
-  * UNRELEASED
+  * New upstream release, 2.0.0 RC4 bzr :
+    - Rename MAAS Rack Controller to MAAS Relay.
+  * debian/*: update all packaging to replace anything that references
+    maas-rack to maas-relay.
 
  -- Andres Rodriguez <[e-mail]>  Wed, 27 Jul 2016 22:26:55 -0400
 
 
=== modified file 'debian/control'
--- debian/control	2016-06-16 15:27:18 +0000
+++ debian/control	2016-08-02 23:56:26 +0000
@@ -17,7 +17,7 @@
 
 Package: maas
 Architecture: all
-Depends: maas-rack-controller (= ${binary:Version}),
+Depends: maas-relay (= ${binary:Version}),
          maas-region-controller (= ${binary:Version}),
          python3-django-maas (= ${binary:Version}),
          ${misc:Depends}
@@ -179,7 +179,7 @@
  .
  This package contains Python 3 modules.
 
-Package: maas-rack-controller
+Package: maas-relay
 Architecture: all
 Depends: authbind,
          bind9utils,
@@ -209,9 +209,9 @@
 Replaces: python-maas-provisioningserver,
           maas-cluster-controller
 Description: Rack Controller for MAAS
- The MAAS rack controller (maas-rackd) provides highly available, fast
+ The MAAS Relay (maas-relayd) provides highly available, fast
  and local broadcast services to the machines provisioned by MAAS. You
- need a MAAS rack controller attached to each fabric (which is a set of
+ need a MAAS Relay attached to each fabric (which is a set of
  trunked switches). You can attach multiple rack controllers to these
  physical networks for high availability, with secondary rack controllers
  automatically stepping to provide these services if the primary rack
@@ -284,7 +284,7 @@
 XB-Installer-Menu-Item: 2350
 Description: Install a MAAS server (installer integration)
 
-Package: maas-rack-udeb
+Package: maas-relay-udeb
 Package-Type: udeb
 Section: debian-installer
 Architecture: all
 
=== modified file 'debian/extras/99-maas-sudoers'
--- debian/extras/99-maas-sudoers	2016-06-10 18:57:41 +0000
+++ debian/extras/99-maas-sudoers	2016-08-02 23:56:26 +0000
@@ -8,7 +8,7 @@
 maas ALL= NOPASSWD: /bin/systemctl stop maas-dhcpd6
 maas ALL= NOPASSWD: /bin/systemctl status tgt
 maas ALL= NOPASSWD: /bin/systemctl start tgt
-maas ALL= NOPASSWD: /bin/systemctl disable maas-rackd
-maas ALL= NOPASSWD: /bin/systemctl stop maas-rackd
-maas ALL= NOPASSWD: /usr/sbin/maas-rack
+maas ALL= NOPASSWD: /bin/systemctl disable maas-relayd
+maas ALL= NOPASSWD: /bin/systemctl stop maas-relayd
+maas ALL= NOPASSWD: /usr/sbin/maas-relay
 maas ALL= NOPASSWD: SETENV: /usr/sbin/tgt-admin, /usr/bin/uec2roottar
 
=== renamed file 'debian/extras/maas-rack' => 'debian/extras/maas-relay'
--- debian/extras/maas-rack	2016-03-17 17:14:49 +0000
+++ debian/extras/maas-relay	2016-08-02 23:56:26 +0000
@@ -54,7 +54,7 @@
     if 'maas-provision' in sys.argv[0]:
         sys.stderr.write(
             "WARNING: The maas-provision command is deprecated and will be "
-            "removed in a future version. From now on please use 'maas-rack' "
+            "removed in a future version. From now on please use 'maas-relay' "
             "instead.\n")
 
     # Allow dhcpd user to call dhcp-notify.
 
=== modified file 'debian/maas-common.templates'
--- debian/maas-common.templates	2016-06-02 16:34:32 +0000
+++ debian/maas-common.templates	2016-08-02 23:56:26 +0000
@@ -37,7 +37,7 @@
  .
  Please provide the password for the MAAS account.
 
-Template: maas-rack-controller/maas-url
+Template: maas-relay/maas-url
 Type: string
 _Description: Ubuntu MAAS API address:
  The MAAS cluster controller and nodes need to contact the MAAS region
@@ -46,9 +46,9 @@
  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
+Template: maas-relay/shared-secret
 Type: password
 _Description: MAAS Rack Controller Shared Secret:
- The MAAS rack controller needs to contact the MAAS region controller
+ The MAAS Relay needs to contact the MAAS region controller
  with the shared secret found in /var/lib/maas/secret on the region controller.
  Set the shared secret here.
 
=== modified file 'debian/maas-dhcp.maas-dhcpd.service'
--- debian/maas-dhcp.maas-dhcpd.service	2016-03-22 17:07:45 +0000
+++ debian/maas-dhcp.maas-dhcpd.service	2016-08-02 23:56:26 +0000
@@ -4,7 +4,7 @@
 Wants=network-online.target
 After=network-online.target
 After=time-sync.target
-BindsTo=maas-rackd.service
+BindsTo=maas-relayd.service
 ConditionPathExists=/var/lib/maas/dhcpd.conf
 ConditionPathExists=/var/lib/maas/dhcpd-interfaces
 
 
=== modified file 'debian/maas-dhcp.maas-dhcpd6.service'
--- debian/maas-dhcp.maas-dhcpd6.service	2016-04-22 23:27:40 +0000
+++ debian/maas-dhcp.maas-dhcpd6.service	2016-08-02 23:56:26 +0000
@@ -4,7 +4,7 @@
 Wants=network-online.target
 After=network-online.target
 After=time-sync.target
-BindsTo=maas-rackd.service
+BindsTo=maas-relayd.service
 ConditionPathExists=/var/lib/maas/dhcpd6.conf
 ConditionPathExists=/var/lib/maas/dhcpd6-interfaces
 
 
=== modified file 'debian/maas-region-api.apport'
--- debian/maas-region-api.apport	2016-03-25 18:26:49 +0000
+++ debian/maas-region-api.apport	2016-08-02 23:56:26 +0000
@@ -36,7 +36,7 @@
 
 def add_info(report, ui):
     response = ui.yesno(
-        "The contents of /etc/maas/regiond.conf and /etc/maas/rackd.conf "
+        "The contents of /etc/maas/regiond.conf and /etc/maas/relayd.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/rackd.conf', 'MAASClusterConfig')
+            report, '/etc/maas/relayd.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/rackd.log', 'MAASClusterLog')
+        report, '/var/log/maas/relayd.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-rackd")
+        report, "MAASClusterLog", "maas-relayd")
 
     # Attaching related packages info
     attach_related_packages(report, ['python-django-maas', 'apparmor'])
 
=== modified file 'debian/maas-region-controller.postinst'
--- debian/maas-region-controller.postinst	2016-07-28 02:25:35 +0000
+++ debian/maas-region-controller.postinst	2016-08-02 23:56:26 +0000
@@ -165,8 +165,8 @@
 systemctl restart maas-regiond >/dev/null || true
 invoke-rc.d apache2 restart || true
 
-if [ -f /lib/systemd/system/maas-rackd.service ]; then
-    systemctl restart maas-rackd >/dev/null || true
+if [ -f /lib/systemd/system/maas-relayd.service ]; then
+    systemctl restart maas-relayd >/dev/null || true
 fi
 
 db_stop
 
=== renamed file 'debian/maas-rack-udeb.postinst' => 'debian/maas-relay-udeb.postinst'
--- debian/maas-rack-udeb.postinst	2016-04-07 21:14:09 +0000
+++ debian/maas-relay-udeb.postinst	2016-08-02 23:56:26 +0000
@@ -27,20 +27,20 @@
     1)
         # This is a confirmation that we want to install MAAS. If we don't
         # then we exit the MAAS installation process
-        db_input high maas-rack-udeb/rack-confirmation || true
+        db_input high maas-relay-udeb/relay-confirmation || true
     ;;
     2)
         #Ask for MAAS url
-        db_get maas-rack-udeb/rack-confirmation
+        db_get maas-relay-udeb/relay-confirmation
         if [ "$RET" != "true" ]; then
             break
         fi
-        db_input critical maas-rack-udeb/maas-url || true
+        db_input critical maas-relay-udeb/maas-url || true
     ;;
 
     3)
         # Ask for Shared Secret
-        db_input critical maas-rack-udeb/shared-secret || true
+        db_input critical maas-relay-udeb/shared-secret || true
     ;;
 
     esac
@@ -53,25 +53,25 @@
 done
 db_capb
 
-db_get maas-rack-udeb/rack-confirmation
+db_get maas-relay-udeb/relay-confirmation
 if [ "$RET" != "true" ]; then
-    # MAAS rack controller won't be installed
+    # MAAS Relay won't be installed
     exit 0
 fi
 
-db_get maas-rack-udeb/maas-url
+db_get maas-relay-udeb/maas-url
 url="$RET"
 if [ -n "$url" ]; then
-    set_question maas-rack-controller maas-rack-controller/maas-url string "$url"
+    set_question maas-relay maas-relay/maas-url string "$url"
 fi
 
-db_get maas-rack-udeb/shared-secret
+db_get maas-relay-udeb/shared-secret
 secret="$RET"
 if [ -n "$secret" ]; then
-    set_question maas-rack-controller maas-rack-controller/shared-secret password "$secret"
+    set_question maas-relay maas-relay/shared-secret password "$secret"
 fi
 
 # Tell the package manager that we will be installing MAAS Rack Controller
-db_set pkgsel/include maas-rack-controller
+db_set pkgsel/include maas-relay
 set_question tasksel tasksel/first multiselect "standard, server"
 exit 0
 
=== renamed file 'debian/maas-rack-udeb.templates' => 'debian/maas-relay-udeb.templates'
--- debian/maas-rack-udeb.templates	2016-06-02 16:34:32 +0000
+++ debian/maas-relay-udeb.templates	2016-08-02 23:56:26 +0000
@@ -1,13 +1,13 @@
-Template: debian-installer/maas-rack-udeb/title
+Template: debian-installer/maas-relay-udeb/title
 Type: text
 _Description: Install your Metal as a Service (MAAS) Rack Controller
 
-Template: maas-rack-udeb/rack-confirmation
+Template: maas-relay-udeb/relay-confirmation
 Type: boolean
 _Description: Would you like to proceed with the installation of your MAAS Rack Controller?
- The MAAS rack controller (maas-rackd) provides highly available, fast
+ The MAAS Relay (maas-relayd) provides highly available, fast
  and local broadcast services to the machines provisioned by MAAS. You
- need a MAAS rack controller attached to each fabric (which is a set of
+ need a MAAS Relay attached to each fabric (which is a set of
  trunked switches). You can attach multiple rack controllers to these
  physical networks for high availability, with secondary rack controllers
  automatically stepping to provide these services if the primary rack
@@ -16,19 +16,19 @@
  By choosing to install a MAAS Rack controller, you will have to connect
  it to a Region controller to service your machines.
 
-Template: maas-rack-udeb/maas-url
+Template: maas-relay-udeb/maas-url
 Type: string
 _Description: Ubuntu MAAS Region API address:
- The MAAS rack controller and nodes need to contact the MAAS region
+ The MAAS Relay 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:5240/MAAS".
  .
  Since nodes must be able to access this URL, localhost or 127.0.0.1 are not
  useful values here.
 
-Template: maas-rack-udeb/shared-secret
+Template: maas-relay-udeb/shared-secret
 Type: password
 _Description: MAAS Rack Controller shared secret:
- The MAAS rack controller needs to contact the MAAS region controller
+ The MAAS Relay needs to contact the MAAS region controller
  with the shared secret found in /var/lib/maas/secret on the region controller.
  Set the shared secret here.
 
=== renamed file 'debian/maas-rack-controller.config' => 'debian/maas-relay.config'
--- debian/maas-rack-controller.config	2016-03-07 22:01:56 +0000
+++ debian/maas-relay.config	2016-08-02 23:56:26 +0000
@@ -9,7 +9,7 @@
 # XXX Fix to not ask when installing from the CD.
 if ([ "$1" = "configure" ] && [ -z "$2" ]); then
 
-    db_get maas-rack-controller/maas-url || true
+    db_get maas-relay/maas-url || true
     if [ -z "$RET" ]; then
         # Attempt to pre-populate if installing on the region controller.
         if [ -f /usr/sbin/maas-region ]; then
@@ -19,18 +19,18 @@
             if ! echo $url | grep -qs "/MAAS$"; then
                 url="${url}/MAAS"
             fi
-            db_set maas-rack-controller/maas-url "$url"
+            db_set maas-relay/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_input medium maas-relay/maas-url || true
             db_go
         fi
     fi
 fi
 
 if [ "$1" = "reconfigure" ]; then
-    db_input high maas-rack-controller/maas-url || true
+    db_input high maas-relay/maas-url || true
     db_go
 fi
 #DEBHELPER#
 
=== renamed file 'debian/maas-rack-controller.dirs' => 'debian/maas-relay.dirs'
=== renamed file 'debian/maas-rack-controller.install' => 'debian/maas-relay.install'
--- debian/maas-rack-controller.install	2016-03-25 14:09:59 +0000
+++ debian/maas-relay.install	2016-08-02 23:56:26 +0000
@@ -11,4 +11,4 @@
 # Install all other stuff
 debian/extras/99-maas-sudoers etc/sudoers.d
 debian/extras/maas-probe-dhcp usr/sbin
-debian/extras/maas-rack usr/sbin
+debian/extras/maas-relay usr/sbin
 
=== renamed file 'debian/maas-rack-controller.links' => 'debian/maas-relay.links'
--- debian/maas-rack-controller.links	2016-03-07 22:01:56 +0000
+++ debian/maas-relay.links	2016-08-02 23:56:26 +0000
@@ -1,1 +1,1 @@
-usr/sbin/maas-rack usr/sbin/maas-provision
+usr/sbin/maas-relay usr/sbin/maas-provision
 
=== renamed file 'debian/maas-rack-controller.lintian-overrides' => 'debian/maas-relay.lintian-overrides'
--- debian/maas-rack-controller.lintian-overrides	2016-03-22 17:07:45 +0000
+++ debian/maas-relay.lintian-overrides	2016-08-02 23:56:26 +0000
@@ -1,1 +1,1 @@
-maas-rack-controller: binary-without-manpage usr/bin/uec2roottar usr/sbin/maas-dhcp-helper
+maas-relay: binary-without-manpage usr/bin/uec2roottar usr/sbin/maas-dhcp-helper
 
=== renamed file 'debian/maas-rack-controller.logrotate' => 'debian/maas-relay.logrotate'
--- debian/maas-rack-controller.logrotate	2016-02-04 10:08:48 +0000
+++ debian/maas-relay.logrotate	2016-08-02 23:56:26 +0000
@@ -1,4 +1,4 @@
-/var/log/maas/rackd.log {
+/var/log/maas/relayd.log {
  rotate 5
  weekly
  compress
 
=== renamed file 'debian/maas-rack-controller.maas-rackd.service' => 'debian/maas-relay.maas-relayd.service'
--- debian/maas-rack-controller.maas-rackd.service	2016-03-31 21:53:56 +0000
+++ debian/maas-relay.maas-relayd.service	2016-08-02 23:56:26 +0000
@@ -9,19 +9,19 @@
 Group=maas
 Restart=always
 RestartSec=10s
-Environment="LOGFILE=/var/log/maas/rackd.log"
-# Prevent maas-dhcpd and maas-dhcpd6 from starting until maas-rackd
+Environment="LOGFILE=/var/log/maas/relayd.log"
+# Prevent maas-dhcpd and maas-dhcpd6 from starting until maas-relayd
 # has regenerated the configurations and told the services to start.
 ExecStartPre=/bin/rm -f /var/lib/maas/dhcpd.sock
 ExecStartPre=/bin/rm -f /var/lib/maas/dhcpd.conf
 ExecStartPre=/bin/rm -f /var/lib/maas/dhcpd6.conf
 # Logs go to the journal; read them with
-#   journalctl -u maas-rackd
+#   journalctl -u maas-relayd
 # 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'
+     maas-relayd 2>&1 | tee -a $LOGFILE'
 
 [Install]
 WantedBy=multi-user.target
 
=== renamed file 'debian/maas-rack-controller.maintscript' => 'debian/maas-relay.maintscript'
=== renamed file 'debian/maas-rack-controller.postinst' => 'debian/maas-relay.postinst'
--- debian/maas-rack-controller.postinst	2016-04-07 01:22:47 +0000
+++ debian/maas-relay.postinst	2016-08-02 23:56:26 +0000
@@ -9,10 +9,10 @@
 
 configure_logging() {
     # Give appropriate permissions
-    if [ ! -f /var/log/maas/rackd.log ]; then
-        touch /var/log/maas/rackd.log
+    if [ ! -f /var/log/maas/relayd.log ]; then
+        touch /var/log/maas/relayd.log
     fi
-    chown maas:maas /var/log/maas/rackd.log
+    chown maas:maas /var/log/maas/relayd.log
 }
 
 configure_libdir() {
@@ -73,7 +73,7 @@
 
 configure_cluster_uuid(){
     # This will configure a UUID if one has not previously been set.
-    maas-rack config --init
+    maas-relay config --init
 }
 
 configure_cluster_authbind() {
@@ -93,16 +93,16 @@
 
 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
+    db_get maas-relay/maas-url || true
     if [ -n "$RET" ]; then
-        maas-rack config --region-url "$RET"
+        maas-relay config --region-url "$RET"
     fi
 }
 
 configure_shared_secret() {
-    db_get maas-rack-controller/shared-secret || true
+    db_get maas-relay/shared-secret || true
     if [ -n "$RET" ]; then
-        echo "$RET" | maas-rack install-shared-secret
+        echo "$RET" | maas-relay install-shared-secret
         chown maas:maas /var/lib/maas/secret
         chmod 0640 /var/lib/maas/secret
     fi
@@ -114,10 +114,10 @@
     # it with the new configuration tool.
     if [ -f /etc/maas/maas_cluster.conf ]; then
         uuid=$(extract_cluster_uuid /etc/maas/maas_cluster.conf)
-        maas-rack config --uuid "$uuid"
+        maas-relay config --uuid "$uuid"
         maas_url=$(extract_maas_url /etc/maas/maas_cluster.conf)
-        maas-rack config --region-url "$maas_url"
-        db_set maas-rack-controller/maas-url "$maas_url"
+        maas-relay config --region-url "$maas_url"
+        db_set maas-relay/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
@@ -125,15 +125,15 @@
     # the maas_url and set it to debconf. Otherwise, the config file used
     # is exactly the same.
     if [ -f /etc/maas/clusterd.conf.1.10 ]; then
-        mv /etc/maas/clusterd.conf.1.10 /etc/maas/rackd.conf
-        maas_url=$(extract_maas_url /etc/maas/rackd.conf)
-        db_set maas-rack-controller/maas-url "$maas_url"
+        mv /etc/maas/clusterd.conf.1.10 /etc/maas/relayd.conf
+        maas_url=$(extract_maas_url /etc/maas/relayd.conf)
+        db_set maas-relay/maas-url "$maas_url"
     fi
 }
 
 # Unconditionally ensure that there is at least an empty configuration
 # file. This does *not* overwrite any existing configuration.
-maas-rack config
+maas-relay config
 
 if [ "$1" = "configure" ] && [ -z "$2" ]; then
     configure_logging
@@ -142,7 +142,7 @@
     configure_maas_url
     configure_cluster_uuid
     configure_cluster_authbind
-    maas-rack upgrade-cluster
+    maas-relay upgrade-cluster
     upgrade_from_cluster_controller
     configure_shared_secret
 
@@ -151,7 +151,7 @@
     # Only ask for a shared secret when the region is not installed
     # on the same system.
     if [ ! -f /usr/sbin/maas-region ]; then
-        db_input high maas-rack-controller/shared-secret
+        db_input high maas-relay/shared-secret
         db_go
     fi
     configure_shared_secret
@@ -160,7 +160,7 @@
     configure_logging
     configure_libdir
     configure_cluster_authbind
-    maas-rack upgrade-cluster
+    maas-relay upgrade-cluster
 fi
 
 db_stop
 
=== renamed file 'debian/maas-rack-controller.postrm' => 'debian/maas-relay.postrm'
--- debian/maas-rack-controller.postrm	2016-03-31 23:55:39 +0000
+++ debian/maas-relay.postrm	2016-08-02 23:56:26 +0000
@@ -9,7 +9,7 @@
 case "$1" in
     purge)
         # remove logfile as it wasn't installed by packaging
-        rm -rf /var/log/maas/rackd.log*
+        rm -rf /var/log/maas/relayd.log*
 
         # remove var directories provided it will always have files
         # not installed or tracked by packaging
@@ -33,8 +33,8 @@
             rm -rf /etc/authbind/byuid/$MAAS_UID
         fi
 
-        # Remove rackd.conf file
-        rm -rf /etc/maas/rackd.conf
+        # Remove relayd.conf file
+        rm -rf /etc/maas/relayd.conf
 
         # Deleting old config files if they exist
         if [ -f /etc/maas/pserv.yaml.maas-old ]; then
 
=== renamed file 'debian/maas-rack-controller.preinst' => 'debian/maas-relay.preinst'
--- debian/maas-rack-controller.preinst	2016-03-25 14:09:59 +0000
+++ debian/maas-relay.preinst	2016-08-02 23:56:26 +0000
@@ -38,7 +38,7 @@
     fi
 
     if [ -f /var/log/maas/clusterd.log ]; then
-        mv /var/log/maas/clusterd.log /var/log/maas/rackd.log
+        mv /var/log/maas/clusterd.log /var/log/maas/relayd.log
     fi
 
 fi
 
=== renamed file 'debian/maas-rack-controller.templates' => 'debian/maas-relay.templates'
--- debian/maas-rack-controller.templates	2016-06-02 16:34:32 +0000
+++ debian/maas-relay.templates	2016-08-02 23:56:26 +0000
@@ -1,4 +1,4 @@
-Template: maas-rack-controller/maas-url
+Template: maas-relay/maas-url
 Type: string
 _Description: Ubuntu MAAS API address:
  The MAAS cluster controller and nodes need to contact the MAAS region
@@ -7,9 +7,9 @@
  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
+Template: maas-relay/shared-secret
 Type: password
 _Description: MAAS Rack Controller Shared Secret:
- The MAAS rack controller needs to contact the MAAS region controller
+ The MAAS Relay needs to contact the MAAS region controller
  with the shared secret found in /var/lib/maas/secret on the region controller.
  Set the shared secret here.
 
=== modified file 'debian/rules'
--- debian/rules	2016-07-06 13:49:52 +0000
+++ debian/rules	2016-08-02 23:56:26 +0000
@@ -15,21 +15,21 @@
 override_dh_installinit:
 	dh_installinit -p maas-region-api --name=maas-regiond --no-start
 	dh_installinit -p maas-region-api --name=maas-regiond-worker@  --no-start
-	dh_installinit -p maas-rack-controller --name=maas-rackd
+	dh_installinit -p maas-relay --name=maas-relayd
 	dh_installinit -p maas-proxy --name=maas-proxy
 	dh_installinit -p maas-dhcp --name=maas-dhcpd
 	dh_installinit -p maas-dhcp --name=maas-dhcpd6
 
 override_dh_systemd_enable:
 	dh_systemd_enable -p maas-region-api --name=maas-regiond
-	dh_systemd_enable -p maas-rack-controller --name=maas-rackd
+	dh_systemd_enable -p maas-relay --name=maas-relayd
 	dh_systemd_enable -p maas-proxy --name=maas-proxy
 	dh_systemd_enable -p maas-dhcp --name=maas-dhcpd
 	dh_systemd_enable -p maas-dhcp --name=maas-dhcpd6
 
 override_dh_systemd_start:
 	dh_systemd_start -p maas-region-api --no-start maas-regiond.service
-	dh_systemd_start -p maas-rack-controller maas-rackd.service
+	dh_systemd_start -p maas-relay maas-relayd.service
 	dh_systemd_start -p maas-proxy maas-proxy.service
 	dh_systemd_start -p maas-dhcp maas-dhcpd.service
 	dh_systemd_start -p maas-dhcp maas-dhcpd6.service
@@ -64,7 +64,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-api; \
-		dh_install twisted/plugins/maasrackd.py usr/lib/$$python/dist-packages/twisted/plugins -pmaas-rack-controller; \
+		dh_install twisted/plugins/maasrelayd.py usr/lib/$$python/dist-packages/twisted/plugins -pmaas-relay; \
 	done
 
 	dh_install --list-missing