Merge lp:~kirkland/maas/1297097 into lp:~maas-maintainers/maas/packaging

Proposed by Dustin Kirkland  on 2014-03-25
Status: Merged
Approved by: Gavin Panella on 2014-03-25
Approved revision: 253
Merged at revision: 253
Proposed branch: lp:~kirkland/maas/1297097
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 269 lines (+53/-127)
2 files modified
debian/changelog (+7/-1)
debian/control (+46/-126)
To merge this branch: bzr merge lp:~kirkland/maas/1297097
Reviewer Review Type Date Requested Status
Dustin Kirkland  (community) Resubmit on 2014-03-25
Julian Edwards (community) 2014-03-25 Approve on 2014-03-25
Review via email: mp+212548@code.launchpad.net

Commit message

Improve MAAS's package descriptions.

To post a comment you must log in.
Julian Edwards (julian-edwards) wrote :

Nice change! This has been a sore point for a while. Just one small nit:

> +Description: Ubuntu MAAS command line tool
> + This package contains the MAAS client command line tool. This tool
> + enables shell automation of tasks in MAAS.

This is a command line *API* tool, it provides a way to drive MAAS over its
API from any remote or local machine.

review: Approve
Julian Edwards (julian-edwards) wrote :

Don't forget to set a commit message when you set the MP to approved or the lander will ignore you.

Mark Shuttleworth (sabdfl) wrote :

Pls call it "MAAS" not "Ubuntu MAAS". Thanks!

lp:~kirkland/maas/1297097 updated on 2014-03-25
253. By Dustin Kirkland  on 2014-03-25

drop "Ubuntu" in front of MAAS, clean up command line/API description

Dustin Kirkland  (kirkland) wrote :

Thanks @julian-edwards, @sabdfl. Pushed r253 to lp:~kirkland/maas/1297097.

review: Resubmit

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-03-21 11:58:34 +0000
3+++ debian/changelog 2014-03-25 15:28:37 +0000
4@@ -18,10 +18,16 @@
5 * debian/maas-dns.postinst: Call edit_named_options to add a line in
6 /etc/bind/named.conf.options that includes the
7 /etc/named/maas/named.conf.options.inside.maas file.
8- * debian/control:
9+ * debian/control:
10 - maas-dns depends on python-iscpy
11 - maas-cluster-controller depends on python-seamicroclient
12
13+ [ Dustin Kirkland ]
14+ * debian/control: LP: #1297097
15+ - clean up package descriptions, modernize, and more clearly/simply
16+ explain what each package does
17+ - drop "Ubuntu" in front of MAAS, clean up command line/API description
18+
19 -- Julian Edwards <julian.edwards@canonical.com> Fri, 21 Mar 2014 21:57:26 +1000
20
21 maas (1.5+bzr1977-0ubuntu1) trusty; urgency=low
22
23=== modified file 'debian/control'
24--- debian/control 2014-03-21 11:58:34 +0000
25+++ debian/control 2014-03-25 15:28:37 +0000
26@@ -15,35 +15,31 @@
27 Package: maas
28 Architecture: all
29 Depends: ${misc:Depends}, maas-cluster-controller, maas-region-controller, python-django-maas
30-Description: Ubuntu MAAS Server
31- Ubuntu MAAS Server is the successor to Orchestra. It offers a
32- nice UI to provision your Ubuntu servers. Each physical server
33- (“node”) will be commissioned automatically on first boot.
34- During the commissioning process administrators are able to
35- configure hardware settings manually before an automated smoke
36- test and burn-in test are done. Once commissioned, a node can
37- be deployed on demand by name, or allocated to a queue for
38- dynamic allocation to services being deployed on this MAAS.
39- .
40- This package is a metapackage which installs a complete MAAS
41- service on a single machine.
42+Description: MAAS server all-in-one metapackage
43+ MAAS is "Metal As A Service", a system for dynamic provisioning of physical
44+ servers that has many of the same characteristics as a cloud. You register
45+ servers with MAAS by telling MAAS about their IPMI or other control system.
46+ MAAS can then do hardware inventory, and provision that system on demand
47+ with whatever OS and software you like. MAAS is standalone software that
48+ works with any configuration system, but for best results combine MAAS with
49+ Juju.
50+ .
51+ MAAS provides:
52+ * Hardware inventory of servers
53+ * Dynamic provisioning based on name or attributes such as disk, RAM cores, sockets
54+ * DNS and DHCP as needed
55+ * PXE boot services
56+ .
57+ This package is a metapackage which installs all of the separate components
58+ of MAAS on a single machine.
59
60 Package: maas-common
61 Architecture: all
62 Depends: ${misc:Depends}, ${python:Depends}
63 Breaks: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
64 Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
65-Description: Ubuntu MAAS Server
66- Ubuntu MAAS Server is the successor to Orchestra. It offers a
67- nice UI to provision your Ubuntu servers. Each physical server
68- (“node”) will be commissioned automatically on first boot.
69- During the commissioning process administrators are able to
70- configure hardware settings manually before an automated smoke
71- test and burn-in test are done. Once commissioned, a node can
72- be deployed on demand by name, or allocated to a queue for
73- dynamic allocation to services being deployed on this MAAS.
74- .
75- This package contains common files
76+Description: MAAS server common files
77+ This package contains the common files for any MAAS installation.
78
79 Package: maas-region-controller-min
80 Architecture: all
81@@ -69,18 +65,10 @@
82 ${python:Depends}
83 Breaks: maas-region-controller ( <= 1.4+bzr1693+dfsg-0ubuntu3 )
84 Replaces: maas-region-controller ( <= 1.4+bzr1693+dfsg-0ubuntu3 )
85-Description: Ubuntu MAAS Server
86- Ubuntu MAAS Server is the successor to Orchestra. It offers a
87- nice UI to provision your Ubuntu servers. Each physical server
88- (“node”) will be commissioned automatically on first boot.
89- During the commissioning process administrators are able to
90- configure hardware settings manually before an automated smoke
91- test and burn-in test are done. Once commissioned, a node can
92- be deployed on demand by name, or allocated to a queue for
93- dynamic allocation to services being deployed on this MAAS.
94- .
95- This package installs the region controller services: the web
96- UI.
97+Description: MAAS Server minimum region controller
98+ This package installs and configures the minimum region controller
99+ services provided by MAAS, including the web UI, caching package proxy,
100+ networking/traffic control, and remote logging system.
101
102 Package: maas-region-controller
103 Architecture: all
104@@ -90,18 +78,9 @@
105 ${misc:Depends},
106 ${python:Depends}
107 Recommends: openssh-server, maas-dns (= ${binary:Version})
108-Description: Ubuntu MAAS Server
109- Ubuntu MAAS Server is the successor to Orchestra. It offers a
110- nice UI to provision your Ubuntu servers. Each physical server
111- (“node”) will be commissioned automatically on first boot.
112- During the commissioning process administrators are able to
113- configure hardware settings manually before an automated smoke
114- test and burn-in test are done. Once commissioned, a node can
115- be deployed on demand by name, or allocated to a queue for
116- dynamic allocation to services being deployed on this MAAS.
117- .
118- This package installs the region controller services: the web
119- UI and the database.
120+Description: MAAS server complete region controller
121+ This package installs and configures the complete MAAS region controller,
122+ including the minimum setup, plus the database server and messaging queue.
123
124 Package: python-maas-provisioningserver
125 Section: python
126@@ -133,17 +112,8 @@
127 Breaks: python-django-maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-cluster-controller (<= 0.1+bzr1243+dfsg-0ubuntu3), maas-dhcp (<= 1.4+bzr1817+dfsg-0ubuntu1)
128 Replaces: python-django-maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-cluster-controller (<= 0.1+bzr1243+dfsg-0ubuntu3), maas-dhcp (<= 1.4+bzr1817+dfsg-0ubuntu1)
129 Conflicts: python-librabbitmq
130-Description: Ubuntu MAAS Server
131- Ubuntu MAAS Server is the successor to Orchestra. It offers a
132- nice UI to provision your Ubuntu servers. Each physical server
133- (“node”) will be commissioned automatically on first boot.
134- During the commissioning process administrators are able to
135- configure hardware settings manually before an automated smoke
136- test and burn-in test are done. Once commissioned, a node can
137- be deployed on demand by name, or allocated to a queue for
138- dynamic allocation to services being deployed on this MAAS.
139- .
140- This package contains the provisioning server libraries.
141+Description: MAAS server provisioning libraries
142+ This package provides the MAAS provisioning server python libraries.
143
144 Package: maas-cli
145 Architecture: all
146@@ -155,17 +125,10 @@
147 ${python:Depends}
148 Conflicts: maas-region-controller-min (<= 1.5+bzr1909-0ubuntu1)
149 Replaces: maas-region-controller-min (<= 1.5+bzr1909-0ubuntu1)
150-Description: Ubuntu MAAS Client Tool
151- Ubuntu MAAS Server is the successor to Orchestra. It offers a
152- nice UI to provision your Ubuntu servers. Each physical server
153- (“node”) will be commissioned automatically on first boot.
154- During the commissioning process administrators are able to
155- configure hardware settings manually before an automated smoke
156- test and burn-in test are done. Once commissioned, a node can
157- be deployed on demand by name, or allocated to a queue for
158- dynamic allocation to services being deployed on this MAAS.
159- .
160- This package contains the client command line tool.
161+Description: MAAS command line API tool
162+ This package contains the MAAS client command line API tool.
163+ This tool enables automation of tasks in MAAS, remotely, through
164+ its API.
165
166 Package: python-maas-client
167 Section: python
168@@ -173,17 +136,8 @@
169 Depends: python-oauth, ${misc:Depends}, ${python:Depends}
170 Breaks: maas (<= 0.1+bzr971+dfsg-0ubuntu2 )
171 Replaces: maas (<= 0.1+bzr971+dfsg-0ubuntu2 )
172-Description: Ubuntu MAAS API Client - (python files)
173- Ubuntu MAAS Server is the successor to Orchestra. It offers a
174- nice UI to provision your Ubuntu servers. Each physical server
175- (“node”) will be commissioned automatically on first boot.
176- During the commissioning process administrators are able to
177- configure hardware settings manually before an automated smoke
178- test and burn-in test are done. Once commissioned, a node can
179- be deployed on demand by name, or allocated to a queue for
180- dynamic allocation to services being deployed on this MAAS.
181- .
182- This package contains the client API Python modules.
183+Description: MAAS python API client
184+ This package contains the MAAS client API Python modules.
185
186 Package: maas-cluster-controller
187 Architecture: all
188@@ -218,19 +172,10 @@
189 Conflicts: tftpd-hpa, python-librabbitmq
190 Breaks: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-region-controller ( <= 0.1+bzr1314+dfsg-0ubuntu1 )
191 Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-region-controller ( <= 0.1+bzr1314+dfsg-0ubuntu1 )
192-Description: Ubuntu MAAS Cluster Controller
193- Ubuntu MAAS Server is the successor to Orchestra. It offers a
194- nice UI to provision your Ubuntu servers. Each physical server
195- (“node”) will be commissioned automatically on first boot.
196- During the commissioning process administrators are able to
197- configure hardware settings manually before an automated smoke
198- test and burn-in test are done. Once commissioned, a node can
199- be deployed on demand by name, or allocated to a queue for
200- dynamic allocation to services being deployed on this MAAS.
201- .
202- This package contains the cluster controller, which is
203- responsible for controlling remote DHCP/TFTP instances on their
204- own subnets.
205+Description: MAAS server cluster controller
206+ This package contains the MAAS cluster controller, which is responsible
207+ for enabling and controlling remote DHCP/TFTP instances on their own
208+ subnets.
209
210 Package: python-django-maas
211 Section: python
212@@ -259,34 +204,17 @@
213 ${misc:Depends},
214 ${python:Depends}
215 Conflicts: python-librabbitmq
216-Description: Ubuntu MAAS Server - (django files)
217- Ubuntu MAAS Server is the successor to Orchestra. It offers a
218- nice UI to provision your Ubuntu servers. Each physical server
219- (“node”) will be commissioned automatically on first boot.
220- During the commissioning process administrators are able to
221- configure hardware settings manually before an automated smoke
222- test and burn-in test are done. Once commissioned, a node can
223- be deployed on demand by name, or allocated to a queue for
224- dynamic allocation to services being deployed on this MAAS.
225- .
226- This package contains the Django files.
227+Description: MAAS server Django web framework
228+ This package provides the Django web framework for MAAS.
229
230 Package: maas-dhcp
231 Architecture: all
232 Depends: isc-dhcp-server (>= 4.2.4), ${misc:Depends}
233 Breaks: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
234 Replaces: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
235-Description: Ubuntu MAAS Server - DHCP Configuration (meta-package)
236- Ubuntu MAAS Server is the successor to Orchestra. It offers a
237- nice UI to provision your Ubuntu servers. Each physical server
238- (“node”) will be commissioned automatically on first boot.
239- During the commissioning process administrators are able to
240- configure hardware settings manually before an automated smoke
241- test and burn-in test are done. Once commissioned, a node can
242- be deployed on demand by name, or allocated to a queue for
243- dynamic allocation to services being deployed on this MAAS.
244- .
245- This package configures a DHCP that can be used with MAAS.
246+Description: MAAS DHCP server
247+ This package installs and configures a DHCP server that can be used by
248+ MAAS, and enhances the overall MAAS user experience.
249
250 Package: maas-dns
251 Architecture: all
252@@ -297,14 +225,6 @@
253 Conflicts: dnsmasq
254 Breaks: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
255 Replaces: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
256-Description: Ubuntu MAAS Server - DNS configuration (metapackage)
257- Ubuntu MAAS Server is the successor to Orchestra. It offers a
258- nice UI to provision your Ubuntu servers. Each physical server
259- (“node”) will be commissioned automatically on first boot.
260- During the commissioning process administrators are able to
261- configure hardware settings manually before an automated smoke
262- test and burn-in test are done. Once commissioned, a node can
263- be deployed on demand by name, or allocated to a queue for
264- dynamic allocation to services being deployed on this MAAS.
265- .
266- This package configures a DNS that can be used with MAAS.
267+Description: MAAS DNS server
268+ This package installs and configures a DNS server that can be used by
269+ MAAS, and enhances the overall MAAS user experience.

Subscribers

People subscribed via source and target branches