Merge lp:~andreserl/maas/further_package_description_updates into lp:~maas-maintainers/maas/packaging

[Andres Rodriguez]

Unmerged revisions

=== modified file 'debian/changelog'
--- debian/changelog	2016-03-25 17:44:04 +0000
+++ debian/changelog	2016-03-25 20:16:34 +0000
@@ -4,6 +4,7 @@
   * Ensure /etc/maas/templates/power gets removed on upgrade
   * debian/control: Update homepage and package descriptions.
     (LP: #1562036, LP: #1562034, LP: #1562062)
+  * Rename maas-reigon-controller-min to maas-region-api (LP: #1562069)
 
  -- Andres Rodriguez <[e-mail]>  Wed, 23 Mar 2016 12:27:27 -0400
 

=== modified file 'debian/control'
--- debian/control	2016-03-25 17:44:04 +0000
+++ debian/control	2016-03-25 20:16:34 +0000
@@ -23,35 +23,37 @@
          ${misc:Depends}
 Description: "Metal as a Service" is a physical cloud and IPAM
  MAAS runs a software-defined data centre - it turns a collection of physical
- servers into an on-demand bare metal cloud with full open source IP address
- management (IPAM).
+ servers and switches into a bare metal cloud with full open source IP address
+ management (IPAM) and instant provisioning on demand.
  .
  MAAS controls the servers through IPMI or another BMC or  converged chassis
- controller such as Cisco UCS. It provides a full inventory of components,
- and can install Ubuntu, CentOS or Windows very fast on any server under
- its control.
+ controller such as Cisco UCS. It provides a full inventory  of components,
+ and can install Ubuntu, CentOS or Windows very fast on any  server under
+ its control. It can also track and provide DHCP and DNS for other devices
+ on the network.
  .
  MAAS handles VLANs and fabrics that span many trunked switches, as well as
  the routing-centric infrastructure typically used for large-scale OpenStack
- or other scale-out deployments. MAAS can track IP addresses and provides
- APIs for address assignment and release. MAAS can also assign IP addresses
- for containers on machines, and release them when the machine is repurposed.
- MAAS provides PXE, DHCP, DNS and other low-level  services to ensure the
- cluster works smoothly.
+ or other scale-out deployments. MAAS manages IP addresses and provides APIs
+ for address assignment and release. MAAS can also allocate IP addresses for
+ containers on machines, and release them when the machine is repurposed. MAAS
+ provides PXE, DHCP, DNS and other low-level  services to ensure the cluster
+ works smoothly.
  .
  MAAS works with any configuration system, and is recommended by the teams
  behind both Chef and Juju as a physical provisioning system.
  .
  MAAS provides:
+ .
   * Hardware inventory of servers
   * Dynamic provisioning based on name or attributes such as disk, RAM, cores,
-    nic's, networking
+    nics, networking, gpu’s or architecture
   * DNS and DHCP as needed
   * PXE boot services
  .
  This package is a metapackage which installs all of the separate components
  of MAAS on a single machine.
-
+ 
 Package: maas-common
 Architecture: all
 Depends: ${misc:Depends}
@@ -60,7 +62,7 @@
 Description: MAAS server common files
  This package contains the common files for any MAAS installation.
 
-Package: maas-region-controller-min
+Package: maas-region-api
 Architecture: all
 Depends: apache2,
          bind9utils,
@@ -82,25 +84,28 @@
          ubuntu-cloudimage-keyring,
          ${misc:Depends},
          ${python3:Depends}
-Description: MAAS Server minimum region controller
- This package installs and configures the minimum region controller
- services provided by MAAS, including the web UI, caching package proxy,
- networking/traffic control, and remote logging system.
+Conflicts: maas-region-controller-min
+Replaces: maas-region-controller-min
+Provides: maas-region-controller-min
+Description: Region controller API service for MAAS
+ The MAAS region controller consists of REST API services and a postgres
+ database. This package installs only the API services (maas-regiond).
+ Use it to scale out the API front-end of your MAAS region controller.
 
 Package: maas-region-controller
 Architecture: all
 Depends: dbconfig-pgsql,
          maas-dns (= ${binary:Version}),
-         maas-region-controller-min (= ${binary:Version}),
+         maas-region-api (= ${binary:Version}),
          postgresql (>= 9.1),
          ${misc:Depends},
 Recommends: openssh-server
 Description: Region Controller for MAAS
- The MAAS region controller is the REST API server for all MAAS clients,
- and the postgres database that maintains machine state for the entire
- data centre (or “region”). The region controller can be scaled-out and
- highly available given the appropriate postgres setup and additional
- API servers.
+ The MAAS region controller (maas-regiond) is the REST API server for
+ all MAAS clients, and the postgres database that maintains machine
+ state for the entire data centre (or “region”). The region controller 
+ an be scaled-out and highly available given the appropriate postgres
+ setup and additional API servers.
  .
  This package installs the postgres database and the API server, so it
  is appropriate for the initial installation of a new MAAS region. To
@@ -203,22 +208,22 @@
 Replaces: python-maas-provisioningserver,
           maas-cluster-controller
 Description: Rack Controller for MAAS
- The MAAS rack controller provides highly available, fast and local
- broadcast services to the machines provisioned by MAAS. There should
- be a MAAS rack controller attached to each fabric (which is a set of
- trunked switches). You can arrange for multiple rack controllers
- that are attached to these physical networks, and MAAS will then be
- highly available, with secondary rack controllers automatically
- stepping to provide these services to a rack if the primary rack
+ The MAAS rack controller (maas-rackd) 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
+ 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
  controller fails.
  .
- A common configuration is to have a rack controller in each rack,
- with secondary network interfaces on one or two other racks for high
+ A common configuration is to have a rack controller in each rack, with
+ a fast primary network interface to the rack switch and secondary
+ network interfaces on one or two other nearby racks for high
  availability redundancy.
  .
- This package also installs all the necessary components to provide
- iSCSI, DHCP, TFTP and power management.
-
+ This package depends on the necessary components to provide iSCSI,
+ DHCP, TFTP and power management.
+ 
 Package: python3-django-maas
 Section: python
 Architecture: all
@@ -253,7 +258,7 @@
 Package: maas-dns
 Architecture: all
 Depends: bind9 (>= 1:9.10.3.dfsg.P2-5~),
-         maas-region-controller-min (= ${binary:Version}),
+         maas-region-api (= ${binary:Version}),
          ${misc:Depends}
 Conflicts: dnsmasq
 Description: MAAS DNS server

=== renamed file 'debian/maas-region-controller-min.apport' => 'debian/maas-region-api.apport'
=== renamed file 'debian/maas-region-controller-min.install' => 'debian/maas-region-api.install'
=== renamed file 'debian/maas-region-controller-min.links' => 'debian/maas-region-api.links'
=== renamed file 'debian/maas-region-controller-min.lintian-overrides' => 'debian/maas-region-api.lintian-overrides'
--- debian/maas-region-controller-min.lintian-overrides	2015-10-07 16:07:03 +0000
+++ debian/maas-region-api.lintian-overrides	2016-03-25 20:16:34 +0000
@@ -1,5 +1,5 @@
-maas-region-controller-min: binary-without-manpage usr/sbin/maas
-maas-region-controller-min: script-not-executable etc/maas/templates/commissioning-user-data/snippets/maas_ipmi_autodetect.py
-maas-region-controller-min: script-not-executable etc/maas/templates/commissioning-user-data/snippets/maas_signal.py
-maas-region-controller-min: script-not-executable etc/maas/templates/commissioning-user-data/user_data.template
-maas-region-controller-min: script-not-executable etc/maas/templates/commissioning-user-data/snippets/maas_get.py
+maas-region-api: binary-without-manpage usr/sbin/maas
+maas-region-api: script-not-executable etc/maas/templates/commissioning-user-data/snippets/maas_ipmi_autodetect.py
+maas-region-api: script-not-executable etc/maas/templates/commissioning-user-data/snippets/maas_signal.py
+maas-region-api: script-not-executable etc/maas/templates/commissioning-user-data/user_data.template
+maas-region-api: script-not-executable etc/maas/templates/commissioning-user-data/snippets/maas_get.py

=== renamed file 'debian/maas-region-controller-min.logrotate' => 'debian/maas-region-api.logrotate'
=== renamed file 'debian/maas-region-controller-min.maas-regiond-worker@.service' => 'debian/maas-region-api.maas-regiond-worker@.service'
=== renamed file 'debian/maas-region-controller-min.maas-regiond.service' => 'debian/maas-region-api.maas-regiond.service'
--- debian/maas-region-controller-min.maas-regiond.service	2015-05-20 21:36:08 +0000
+++ debian/maas-region-api.maas-regiond.service	2016-03-25 20:16:34 +0000
@@ -10,7 +10,7 @@
 ExecStart=/bin/true
 
 #
-# The maas-region-controller-min package configures four workers. This
+# The maas-region-api package configures four workers. This
 # should work for most people. However:
 #
 # * `systemctl start maas-regiond-worker@x` (where 'x' can be anything,

=== renamed file 'debian/maas-region-controller-min.maintscript' => 'debian/maas-region-api.maintscript'
=== renamed file 'debian/maas-region-controller-min.postinst' => 'debian/maas-region-api.postinst'
=== renamed file 'debian/maas-region-controller-min.postrm' => 'debian/maas-region-api.postrm'
=== renamed file 'debian/maas-region-controller-min.preinst' => 'debian/maas-region-api.preinst'
--- debian/maas-region-controller-min.preinst	2015-01-15 20:35:09 +0000
+++ debian/maas-region-api.preinst	2016-03-25 20:16:34 +0000
@@ -4,7 +4,7 @@
 
 . /usr/share/debconf/confmodule
 
-if [ "$1" = "upgrade" ] && dpkg --compare-versions "$2" lt 1.7.0~beta4+bzr3127-0ubuntu1; then
+if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
 
     if [ -f /etc/init/maas-txlongpoll.conf ]; then
         invoke-rc.d maas-txlongpoll stop
@@ -22,11 +22,6 @@
         rm -rf /var/log/maas/celery-region.log
     fi
 
-fi
-
-
-if [ "$1" = "upgrade" ] && dpkg --compare-versions "$2" lt 1.8.0~alpha1+bzr3463-0ubuntu1; then
-
     if [ -f /var/log/maas/maas-django.log ]; then
         rm -rf /var/log/maas/maas-django.log
     fi

=== renamed file 'debian/maas-region-controller-min.prerm' => 'debian/maas-region-api.prerm'
=== renamed file 'debian/maas-region-controller-min.templates' => 'debian/maas-region-api.templates'
=== modified file 'debian/rules'
--- debian/rules	2016-02-10 15:56:10 +0000
+++ debian/rules	2016-03-25 20:16:34 +0000
@@ -13,22 +13,22 @@
 	# internet access
 
 override_dh_installinit:
-	dh_installinit -p maas-region-controller-min --name=maas-regiond --no-start
-	dh_installinit -p maas-region-controller-min --name=maas-regiond-worker@  --no-start
+	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-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-controller-min --name=maas-regiond
+	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-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-controller-min --no-start maas-regiond.service
+	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-proxy maas-proxy.service
 	dh_systemd_start -p maas-dhcp maas-dhcpd.service
@@ -63,7 +63,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-controller-min; \
+		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; \
 	done