MAAS

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

  1. Git
  2. lp:~mpontillo/maas
  3. move-network-monitoring-to-maas-common--part2
  4. Merge into master
Proposed by Mike Pontillo
Status: Rejected
Rejected by: Mike Pontillo
Proposed branch: ~mpontillo/maas:move-network-monitoring-to-maas-common--part2
Merge into: maas:master
Prerequisite: ~mpontillo/maas:move-network-monitoring-to-maas-common--part1
Diff against target: 189 lines (+40/-13)
8 files modified
Makefile (+6/-5)
buildout.cfg (+2/-0)
debian/changelog (+2/-0)
debian/compat (+1/-1)
debian/control (+3/-1)
debian/extras/maas-rack (+0/-0)
debian/maas-common.install (+7/-0)
src/provisioningserver/__main__.py (+19/-6)
Reviewer Review Type Date Requested Status
MAAS Maintainers Pending
Review via email: mp+329413@code.launchpad.net

Commit message

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

To post a comment you must log in.
Revision history for this message
Mike Pontillo (mpontillo) wrote :

Rejecting in favor of proposing a single branch.

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Makefile b/Makefile
2index faea62e..61c5518 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -52,6 +52,7 @@ build: \
6 bin/buildout \
7 bin/database \
8 bin/maas \
9+ bin/maas-common \
10 bin/maas-rack \
11 bin/maas-region \
12 bin/twistd.rack \
13@@ -118,7 +119,7 @@ bin/maas-region bin/twistd.region: \
14
15 bin/test.region: \
16 bin/buildout buildout.cfg versions.cfg setup.py $(js_enums) \
17- bin/maas-region bin/maas-rack
18+ bin/maas-region bin/maas-rack bin/maas-common
19 $(buildout) install region-test
20 @touch --no-create $@
21
22@@ -152,7 +153,7 @@ bin/test.testing: \
23 $(buildout) install testing-test
24 @touch --no-create $@
25
26-bin/maas-rack bin/twistd.rack: \
27+bin/maas-rack bin/twistd.rack bin/maas-common: \
28 bin/buildout buildout.cfg versions.cfg setup.py
29 $(buildout) install rack
30 @touch --no-create $@
31@@ -568,13 +569,13 @@ services/dns/@deps: bin/py
32
33 services/database/@deps: bin/database
34
35-services/rackd/@deps: bin/twistd.rack bin/maas-rack
36+services/rackd/@deps: bin/twistd.rack bin/maas-rack bin/maas-common
37
38 services/reloader/@deps:
39
40-services/regiond/@deps: bin/maas-region bin/maas-rack
41+services/regiond/@deps: bin/maas-region bin/maas-rack bin/maas-common
42
43-services/regiond2/@deps: bin/maas-region bin/maas-rack
44+services/regiond2/@deps: bin/maas-region bin/maas-rack bin/maas-common
45
46 #
47 # Package building
48diff --git a/buildout.cfg b/buildout.cfg
49index 59f18a0..43b1b77 100644
50--- a/buildout.cfg
51+++ b/buildout.cfg
52@@ -279,11 +279,13 @@ eggs =
53 ${common:test-eggs}
54 entry-points =
55 maas-rack=provisioningserver.__main__:main
56+ maas-common=provisioningserver.__main__:main
57 twistd.rack=twisted.scripts.twistd:run
58 extra-paths =
59 ${common:extra-paths}
60 scripts =
61 maas-rack
62+ maas-common
63 twistd.rack
64 initialization =
65 ${common:initialization}
66diff --git a/debian/changelog b/debian/changelog
67index ca64683..f3ba3d5 100644
68--- a/debian/changelog
69+++ b/debian/changelog
70@@ -2,6 +2,8 @@ maas (2.3.0~alpha3-0ubuntu1) UNRELEASED; urgency=medium
71
72 * Move scripts to maas-common that are used by the MAAS
73 region controller in addition to the rack.
74+ * Add /usr/lib/maas/maas-common script.
75+ * Move to debhelper compat level 9.
76
77 -- Mike Pontillo <mike.pontillo@canonical.com> Tue, 22 Aug 2017 15:28:42 -0700
78
79diff --git a/debian/compat b/debian/compat
80index 7f8f011..ec63514 100644
81--- a/debian/compat
82+++ b/debian/compat
83@@ -1 +1 @@
84-7
85+9
86diff --git a/debian/control b/debian/control
87index d3fb250..e0beb12 100644
88--- a/debian/control
89+++ b/debian/control
90@@ -4,6 +4,7 @@ Priority: optional
91 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
92 Build-Depends: debhelper (>= 8.1.0~),
93 dh-apport,
94+ dh-exec,
95 dh-python,
96 dh-systemd,
97 po-debconf,
98@@ -57,7 +58,8 @@ Description: "Metal as a Service" is a physical cloud and IPAM
99 Package: maas-common
100 Architecture: all
101 Depends: rsyslog,
102- ${misc:Depends}
103+ ${misc:Depends},
104+ python3-maas-provisioningserver
105 Breaks: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
106 Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
107 Description: MAAS server common files
108diff --git a/debian/extras/maas-rack b/debian/extras/maas-rack
109old mode 100644
110new mode 100755
111index 4b69afa..4b69afa
112--- a/debian/extras/maas-rack
113+++ b/debian/extras/maas-rack
114diff --git a/debian/maas-common.install b/debian/maas-common.install
115old mode 100644
116new mode 100755
117index aea3a3e..fa268cc
118--- a/debian/maas-common.install
119+++ b/debian/maas-common.install
120@@ -1,3 +1,5 @@
121+#!/usr/bin/dh-exec --with=install
122+
123 debian/tmp/usr/share/maas/maas-rsyslog.conf
124 debian/extras/99-maas-common-sudoers etc/sudoers.d
125 debian/tmp/usr/lib/maas/maas-delete-file
126@@ -7,3 +9,8 @@ debian/tmp/usr/lib/maas/maas-write-file
127 debian/tmp/usr/lib/maas/network-monitor
128 debian/tmp/usr/lib/maas/beacon-monitor
129 debian/tmp/usr/lib/maas/dhcp-monitor
130+
131+# Install an alias to maas-rack as maas-common.
132+# For information on the usage of '=>' here, see:
133+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=245554
134+debian/extras/maas-rack => /usr/lib/maas/maas-common
135diff --git a/src/provisioningserver/__main__.py b/src/provisioningserver/__main__.py
136index 4016e35..042f6b3 100644
137--- a/src/provisioningserver/__main__.py
138+++ b/src/provisioningserver/__main__.py
139@@ -4,6 +4,8 @@
140
141 """Command-line interface for the MAAS provisioning component."""
142
143+import sys
144+
145 from provisioningserver import security
146 import provisioningserver.boot.install_grub
147 import provisioningserver.cluster_config_command
148@@ -19,17 +21,20 @@ from provisioningserver.utils.script import MainScript
149 import provisioningserver.utils.send_beacons
150
151
152-script_commands = {
153- 'check-for-shared-secret': security.CheckForSharedSecretScript,
154- 'config': provisioningserver.cluster_config_command,
155- 'install-shared-secret': security.InstallSharedSecretScript,
156- 'install-uefi-config': provisioningserver.boot.install_grub,
157+COMMON_COMMANDS = {
158 'observe-arp': provisioningserver.utils.arp,
159 'observe-beacons': provisioningserver.utils.beaconing,
160 'observe-mdns': provisioningserver.utils.avahi,
161 'observe-dhcp': provisioningserver.utils.dhcp,
162 'send-beacons': provisioningserver.utils.send_beacons,
163 'scan-network': provisioningserver.utils.scan_network,
164+}
165+
166+RACK_ONLY_COMMANDS = {
167+ 'check-for-shared-secret': security.CheckForSharedSecretScript,
168+ 'config': provisioningserver.cluster_config_command,
169+ 'install-shared-secret': security.InstallSharedSecretScript,
170+ 'install-uefi-config': provisioningserver.boot.install_grub,
171 'register': provisioningserver.register_command,
172 'support-dump': provisioningserver.support_dump,
173 'upgrade-cluster': provisioningserver.upgrade_cluster,
174@@ -37,6 +42,14 @@ script_commands = {
175
176
177 main = MainScript(__doc__)
178-for name, command in sorted(script_commands.items()):
179+
180+commands = COMMON_COMMANDS.copy()
181+
182+# If 'maas-common' isn't being executed, add rack-specific commands in addition
183+# to the generic set of commands.
184+if not sys.argv[0].endswith('/maas-common'):
185+ commands.update(RACK_ONLY_COMMANDS)
186+
187+for name, command in sorted(commands.items()):
188 main.register(name, command)
189 main()

Subscribers

People subscribed via source and target branches