Merge ~mpontillo/maas:move-network-monitoring-to-maas-common--part2 into maas:master

[Mike Pontillo]

Add /usr/lib/maas/maas-common command.

[Mike Pontillo (mpontillo)]

Rejecting in favor of proposing a single branch.

diff --git a/Makefile b/Makefile
index faea62e..61c5518 100644
--- a/Makefile
+++ b/Makefile
@@ -52,6 +52,7 @@ build: \
   bin/buildout \
   bin/database \
   bin/maas \
+  bin/maas-common \
   bin/maas-rack \
   bin/maas-region \
   bin/twistd.rack \
@@ -118,7 +119,7 @@ bin/maas-region bin/twistd.region: \
 
 bin/test.region: \
   bin/buildout buildout.cfg versions.cfg setup.py $(js_enums) \
-  bin/maas-region bin/maas-rack
+  bin/maas-region bin/maas-rack bin/maas-common
 	$(buildout) install region-test
 	@touch --no-create $@
 
@@ -152,7 +153,7 @@ bin/test.testing: \
 	$(buildout) install testing-test
 	@touch --no-create $@
 
-bin/maas-rack bin/twistd.rack: \
+bin/maas-rack bin/twistd.rack bin/maas-common: \
   bin/buildout buildout.cfg versions.cfg setup.py
 	$(buildout) install rack
 	@touch --no-create $@
@@ -568,13 +569,13 @@ services/dns/@deps: bin/py
 
 services/database/@deps: bin/database
 
-services/rackd/@deps: bin/twistd.rack bin/maas-rack
+services/rackd/@deps: bin/twistd.rack bin/maas-rack bin/maas-common
 
 services/reloader/@deps:
 
-services/regiond/@deps: bin/maas-region bin/maas-rack
+services/regiond/@deps: bin/maas-region bin/maas-rack bin/maas-common
 
-services/regiond2/@deps: bin/maas-region bin/maas-rack
+services/regiond2/@deps: bin/maas-region bin/maas-rack bin/maas-common
 
 #
 # Package building
diff --git a/buildout.cfg b/buildout.cfg
index 59f18a0..43b1b77 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -279,11 +279,13 @@ eggs =
   ${common:test-eggs}
 entry-points =
   maas-rack=provisioningserver.__main__:main
+  maas-common=provisioningserver.__main__:main
   twistd.rack=twisted.scripts.twistd:run
 extra-paths =
   ${common:extra-paths}
 scripts =
   maas-rack
+  maas-common
   twistd.rack
 initialization =
   ${common:initialization}
diff --git a/debian/changelog b/debian/changelog
index ca64683..f3ba3d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ maas (2.3.0~alpha3-0ubuntu1) UNRELEASED; urgency=medium
 
   * Move scripts to maas-common that are used by the MAAS
     region controller in addition to the rack.
+  * Add /usr/lib/maas/maas-common script.
+  * Move to debhelper compat level 9.
 
  -- Mike Pontillo <[e-mail]>  Tue, 22 Aug 2017 15:28:42 -0700
 
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index d3fb250..e0beb12 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: debhelper (>= 8.1.0~),
                dh-apport,
+               dh-exec,
                dh-python,
                dh-systemd,
                po-debconf,
@@ -57,7 +58,8 @@ Description: "Metal as a Service" is a physical cloud and IPAM
 Package: maas-common
 Architecture: all
 Depends: rsyslog,
-         ${misc:Depends}
+         ${misc:Depends},
+         python3-maas-provisioningserver
 Breaks: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
 Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
 Description: MAAS server common files
diff --git a/debian/extras/maas-rack b/debian/extras/maas-rack
 old mode 100644
 new mode 100755
index 4b69afa..4b69afa
--- a/debian/extras/maas-rack
+++ b/debian/extras/maas-rack
diff --git a/debian/maas-common.install b/debian/maas-common.install
 old mode 100644
 new mode 100755
index aea3a3e..fa268cc
--- a/debian/maas-common.install
+++ b/debian/maas-common.install
@@ -1,3 +1,5 @@
+#!/usr/bin/dh-exec --with=install
+
 debian/tmp/usr/share/maas/maas-rsyslog.conf
 debian/extras/99-maas-common-sudoers etc/sudoers.d
 debian/tmp/usr/lib/maas/maas-delete-file
@@ -7,3 +9,8 @@ debian/tmp/usr/lib/maas/maas-write-file
 debian/tmp/usr/lib/maas/network-monitor
 debian/tmp/usr/lib/maas/beacon-monitor
 debian/tmp/usr/lib/maas/dhcp-monitor
+
+# Install an alias to maas-rack as maas-common.
+# For information on the usage of '=>' here, see:
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=245554
+debian/extras/maas-rack => /usr/lib/maas/maas-common
diff --git a/src/provisioningserver/__main__.py b/src/provisioningserver/__main__.py
index 4016e35..042f6b3 100644
--- a/src/provisioningserver/__main__.py
+++ b/src/provisioningserver/__main__.py
@@ -4,6 +4,8 @@
 
 """Command-line interface for the MAAS provisioning component."""
 
+import sys
+
 from provisioningserver import security
 import provisioningserver.boot.install_grub
 import provisioningserver.cluster_config_command
@@ -19,17 +21,20 @@ from provisioningserver.utils.script import MainScript
 import provisioningserver.utils.send_beacons
 
 
-script_commands = {
-    'check-for-shared-secret': security.CheckForSharedSecretScript,
-    'config': provisioningserver.cluster_config_command,
-    'install-shared-secret': security.InstallSharedSecretScript,
-    'install-uefi-config': provisioningserver.boot.install_grub,
+COMMON_COMMANDS = {
     'observe-arp': provisioningserver.utils.arp,
     'observe-beacons': provisioningserver.utils.beaconing,
     'observe-mdns': provisioningserver.utils.avahi,
     'observe-dhcp': provisioningserver.utils.dhcp,
     'send-beacons': provisioningserver.utils.send_beacons,
     'scan-network': provisioningserver.utils.scan_network,
+}
+
+RACK_ONLY_COMMANDS = {
+    'check-for-shared-secret': security.CheckForSharedSecretScript,
+    'config': provisioningserver.cluster_config_command,
+    'install-shared-secret': security.InstallSharedSecretScript,
+    'install-uefi-config': provisioningserver.boot.install_grub,
     'register': provisioningserver.register_command,
     'support-dump': provisioningserver.support_dump,
     'upgrade-cluster': provisioningserver.upgrade_cluster,
@@ -37,6 +42,14 @@ script_commands = {
 
 
 main = MainScript(__doc__)
-for name, command in sorted(script_commands.items()):
+
+commands = COMMON_COMMANDS.copy()
+
+# If 'maas-common' isn't being executed, add rack-specific commands in addition
+# to the generic set of commands.
+if not sys.argv[0].endswith('/maas-common'):
+    commands.update(RACK_ONLY_COMMANDS)
+
+for name, command in sorted(commands.items()):
     main.register(name, command)
 main()