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