Merge lp:~lamont/maas/common-templates into lp:~maas-maintainers/maas/packaging

[LaMont Jones]

Common debconf templates need to be delivered by all packages that use them.

Common debconf templates need to be delivered by all packages that use them. See 'SHARED TEMPLATES' in debconf-devel(7)

[Andres Rodriguez (andreserl)]

lgtm! Just one thing inline.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-04-11 14:28:46 +0000
+++ debian/changelog	2016-04-13 13:28:18 +0000
@@ -3,6 +3,7 @@
   * UNRELEASED
   * Only create the squid cache if we have a configuration file.
     LP: #1568847
+  * Add shared debconf templates.
 
  -- Andres Rodriguez <[e-mail]>  Thu, 07 Apr 2016 18:22:00 -0400
 

=== modified file 'debian/maas-common.templates'
--- debian/maas-common.templates	2016-04-07 01:22:47 +0000
+++ debian/maas-common.templates	2016-04-13 13:28:18 +0000
@@ -39,7 +39,6 @@
 
 Template: maas-rack-controller/maas-url
 Type: string
-Default:
 _Description: Ubuntu MAAS API address:
  The MAAS cluster controller and nodes need to contact the MAAS region
  controller API.  Set the URL at which they can reach the MAAS API remotely,
@@ -49,7 +48,6 @@
 
 Template: maas-rack-controller/shared-secret
 Type: password
-Default:
 _Description: MAAS Cluster Controller Shared Secret:
  The MAAS Cluster Controller needs to contact the MAAS server
  with a share secret. Set the shared secret here.

=== added file 'debian/maas-rack-controller.templates'
--- debian/maas-rack-controller.templates	1970-01-01 00:00:00 +0000
+++ debian/maas-rack-controller.templates	2016-04-13 13:28:18 +0000
@@ -0,0 +1,14 @@
+Template: maas-rack-controller/maas-url
+Type: string
+_Description: Ubuntu MAAS API address:
+ The MAAS cluster controller and nodes need to contact the MAAS region
+ controller API.  Set the URL at which they can reach the MAAS API remotely,
+ e.g. "http://192.168.1.1/MAAS".
+ Since nodes must be able to access this URL, localhost or 127.0.0.1 are not
+ useful values here.
+
+Template: maas-rack-controller/shared-secret
+Type: password
+_Description: MAAS Cluster Controller Shared Secret:
+ The MAAS Cluster Controller needs to contact the MAAS server
+ with a share secret. Set the shared secret here.

=== modified file 'debian/maas-rack-udeb.templates'
--- debian/maas-rack-udeb.templates	2016-04-07 14:03:04 +0000
+++ debian/maas-rack-udeb.templates	2016-04-13 13:28:18 +0000
@@ -18,7 +18,6 @@
 
 Template: maas-rack-udeb/maas-url
 Type: string
-Default:
 _Description: Ubuntu MAAS Region API address:
  The MAAS rack controller and nodes need to contact the MAAS region
  controller API.  Set the URL at which they can reach the MAAS API remotely,
@@ -29,7 +28,6 @@
 
 Template: maas-rack-udeb/shared-secret
 Type: password
-Default:
 _Description: MAAS Rack Controller shared secret:
  The MAAS Rack Controller needs to contact the MAAS server
  with a share secret. This shared secret can be found on

=== added file 'debian/maas-region-controller.templates'
--- debian/maas-region-controller.templates	1970-01-01 00:00:00 +0000
+++ debian/maas-region-controller.templates	2016-04-13 13:28:18 +0000
@@ -0,0 +1,24 @@
+Template: maas/default-maas-url
+Type: string
+_Description: Ubuntu MAAS PXE/Provisioning network address:
+ The Ubuntu MAAS Server automatically detects the IP address
+ that is used for PXE and provisioning. However, it needs to be
+ in the same network as the clients. If the automatically
+ detected address is not in the same network as the clients, it
+ must be changed.
+
+Template: maas/username
+Type: string
+_Description: Ubuntu MAAS username
+ The Ubuntu MAAS server requires the administrator to create a
+ username and password combination.
+ .
+ Please provide the username for the MAAS account.
+
+Template: maas/password
+Type: password
+_Description: Ubuntu MAAS password
+ The Ubuntu MAAS server requires the administrator to create a
+ username and password combination.
+ .
+ Please provide the password for the MAAS account.