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

[Andres Rodriguez]

Add maas-region-udeb and maas-rack-udeb to be used as part of the Ubuntu Server Installer (LP: #1561954)

[lp:~andreserl/maas/lp1561954]

483. By Andres Rodriguez on 2016-04-07

* New upstream release, 2.0.0 beta 2 bzr 4883 (Standing FFe LP: #1553261)
* Add maas-region-udeb and maas-rack-udeb to be used as part of the
  Ubuntu Server Installer (LP: #1561954)
  - ensure maas-rack-controller and maas-region-controller can be fully
    preseeded.

484. By Andres Rodriguez on 2016-04-07

update

485. By Andres Rodriguez on 2016-04-07

Fix maas-region-udeb.postinst for better interaction

486. By Andres Rodriguez on 2016-04-07

Fix rack

487. By Andres Rodriguez on 2016-04-07

fixed

488. By Andres Rodriguez on 2016-04-07

fix

[Mathieu Trudel-Lapierre (cyphermox)]

Considering this code doesn't have to do much more than set a username/password or URLs and such, you could have done it with a single udeb which asks the question whether you want to install a region controller or rack controller (the question would be preseeded for the purpose of the Server CD anyway). That said, the approach to take is yours to choose.

I'm a little concerned with the pkgsel and tasksel usage though, as I can see this would likely override other preseeding set by the user, which may not be what you want:
+db_set pkgsel/include maas
+set_question tasksel tasksel/first multiselect "standard, server"

This will override pkgsel/include, so you may wish to db_get it first and merge the changes in (no deduplication needed), and the same applies to tasksel/first.

review: Needs Fixing

[LaMont Jones (lamont)]

Just one comment (I'll let you check into what the XC- tells the packager to do...) Looks good otherwise, nothing screams at me. If it works, call it good.

review: Approve

[LaMont Jones (lamont)]

> Considering this code doesn't have to do much more than set a
> username/password or URLs and such, you could have done it with a single udeb
> which asks the question whether you want to install a region controller or
> rack controller (the question would be preseeded for the purpose of the Server
> CD anyway). That said, the approach to take is yours to choose.
>
> I'm a little concerned with the pkgsel and tasksel usage though, as I can see
> this would likely override other preseeding set by the user, which may not be
> what you want:
> +db_set pkgsel/include maas
> +set_question tasksel tasksel/first multiselect "standard, server"
>
> This will override pkgsel/include, so you may wish to db_get it first and
> merge the changes in (no deduplication needed), and the same applies to
> tasksel/first.

Good points.

[lp:~andreserl/maas/lp1561954]

489. By Andres Rodriguez on 2016-04-07

remove unneeded comment

490. By Andres Rodriguez on 2016-04-07

Fix lamon'ts comments

[Andres Rodriguez (andreserl)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-04-05 21:02:49 +0000
+++ debian/changelog	2016-04-07 21:21:25 +0000
@@ -1,6 +1,10 @@
-maas (2.0.0~beta2+bzr4873-0ubuntu1) UNRELEASED; urgency=medium
+maas (2.0.0~beta2+bzr4885-0ubuntu1) UNRELEASED; urgency=medium
 
-  * UNRELEASED
+  * New upstream release, 2.0.0 beta 2 bzr 4885 (Standing FFe LP: #1553261)
+  * Add maas-region-udeb and maas-rack-udeb to be used as part of the
+    Ubuntu Server Installer (LP: #1561954)
+    - ensure maas-rack-controller and maas-region-controller can be fully
+      preseeded.
 
  -- Andres Rodriguez <[e-mail]>  Tue, 05 Apr 2016 17:02:32 -0400
 
 
=== modified file 'debian/control'
--- debian/control	2016-04-01 13:18:49 +0000
+++ debian/control	2016-04-07 21:21:25 +0000
@@ -11,7 +11,7 @@
                python3-django,
                python3-setuptools,
                python3-twisted
-Standards-Version: 3.9.6
+Standards-Version: 3.9.7
 X-Python3-Version: >= 3.5
 Homepage: http://maas.io/
 
@@ -53,7 +53,7 @@
  .
  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}
@@ -223,7 +223,7 @@
  .
  This package depends on the necessary components to provide iSCSI,
  DHCP, TFTP and power management.
- 
+
 Package: python3-django-maas
 Section: python
 Architecture: all
@@ -272,3 +272,23 @@
 Description: MAAS Caching Proxy
  This package installs and configures a Caching Proxy server that can be
  used by MAAS. It enhances the overall MAAS user experience.
+
+Package: maas-region-udeb
+Package-Type: udeb
+Section: debian-installer
+Architecture: any
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends}
+XB-Installer-Menu-Item: 2350
+Description: Install a MAAS server (installer integration)
+
+Package: maas-rack-udeb
+Package-Type: udeb
+Section: debian-installer
+Architecture: any
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends}
+XB-Installer-Menu-Item: 2350
+Description: Install a MAAS Rack controller (installer integration)
 
=== renamed file 'debian/maas-region-api.templates' => 'debian/maas-common.templates'
--- debian/maas-region-api.templates	2016-03-25 18:26:49 +0000
+++ debian/maas-common.templates	2016-04-07 21:21:25 +0000
@@ -19,4 +19,37 @@
  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. 
+ 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.
+
+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,
+ 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
+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.
 
=== modified file 'debian/maas-rack-controller.postinst'
--- debian/maas-rack-controller.postinst	2016-04-01 18:27:46 +0000
+++ debian/maas-rack-controller.postinst	2016-04-07 21:21:25 +0000
@@ -144,6 +144,7 @@
     configure_cluster_authbind
     maas-rack upgrade-cluster
     upgrade_from_cluster_controller
+    configure_shared_secret
 
 elif [ -n "$DEBCONF_RECONFIGURE" ]; then
     configure_maas_url
 
=== removed file 'debian/maas-rack-controller.templates'
--- debian/maas-rack-controller.templates	2016-02-04 10:08:48 +0000
+++ debian/maas-rack-controller.templates	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-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,
- 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
-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-udeb.postinst'
--- debian/maas-rack-udeb.postinst	1970-01-01 00:00:00 +0000
+++ debian/maas-rack-udeb.postinst	2016-04-07 21:21:25 +0000
@@ -0,0 +1,77 @@
+#!/bin/sh -e
+
+# Source debconf library.
+. /usr/share/debconf/confmodule
+db_version 2.0
+
+# This conf script is capable of backing up
+db_capb backup
+
+logfile=/var/lib/preseed/log
+set_question () {
+	echo "$1 $2 $3 $4" >>"$logfile"
+	if ! db_fget "$2" seen; then
+		db_register debian-installer/dummy "$2"
+		db_subst "$2" ID "$2"
+		db_fget "$2" seen
+	fi
+	if [ "$RET" = false ]; then
+		db_set "$2" "$4"
+		db_fset "$2" seen true
+	fi
+}
+
+STATE=1
+while [ "$STATE" != 0 -a "$STATE" != 4 ]; do
+    case "$STATE" in
+    1)
+        # This is a confirmation that we want to install MAAS. If we don't
+        # then we exit the MAAS installation process
+        db_input high maas-rack-udeb/rack-confirmation || true
+    ;;
+    2)
+        #Ask for MAAS url
+        db_get maas-rack-udeb/rack-confirmation
+        if [ "$RET" != "true" ]; then
+            break
+        fi
+        db_input critical maas-rack-udeb/maas-url || true
+    ;;
+
+    3)
+        # Ask for Shared Secret
+        db_input critical maas-rack-udeb/shared-secret || true
+    ;;
+
+    esac
+
+    if db_go; then
+        STATE=$(($STATE + 1))
+    else
+        STATE=$(($STATE - 1))
+    fi
+done
+db_capb
+
+db_get maas-rack-udeb/rack-confirmation
+if [ "$RET" != "true" ]; then
+    # MAAS rack controller won't be installed
+    exit 0
+fi
+
+db_get maas-rack-udeb/maas-url
+url="$RET"
+if [ -n "$url" ]; then
+    set_question maas-rack-controller maas-rack-controller/maas-url string "$url"
+fi
+
+db_get maas-rack-udeb/shared-secret
+secret="$RET"
+if [ -n "$secret" ]; then
+    set_question maas-rack-controller maas-rack-controller/shared-secret password "$secret"
+fi
+
+# Tell the package manager that we will be installing MAAS Rack Controller
+db_set pkgsel/include maas-rack-controller
+set_question tasksel tasksel/first multiselect "standard, server"
+exit 0
 
=== added file 'debian/maas-rack-udeb.templates'
--- debian/maas-rack-udeb.templates	1970-01-01 00:00:00 +0000
+++ debian/maas-rack-udeb.templates	2016-04-07 21:21:25 +0000
@@ -0,0 +1,36 @@
+Template: debian-installer/maas-rack-udeb/title
+Type: text
+_Description: Install your Metal as a Service (MAAS) Rack Controller
+
+Template: maas-rack-udeb/rack-confirmation
+Type: boolean
+_Description: Would you like to proceed with the installation of your MAAS Rack Controller?
+ 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.
+ .
+ By choosing to install a MAAS Rack controller, you will have to connect
+ it to a Region controller to service your machines.
+
+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,
+ e.g. "http://192.168.1.1:5240/MAAS".
+ .
+ Since nodes must be able to access this URL, localhost or 127.0.0.1 are not
+ useful values here.
+
+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
+ the MAAS Region Controller server under /var/lib/maas/secret.
 
=== modified file 'debian/maas-region-controller.postinst'
--- debian/maas-region-controller.postinst	2016-03-31 20:03:18 +0000
+++ debian/maas-region-controller.postinst	2016-04-07 21:21:25 +0000
@@ -91,6 +91,16 @@
         configure_migrate_maas_dns
     fi
 
+    db_get maas/username
+    username="$RET"
+    if [ -n "$username" ]; then
+        db_get maas/password
+        password="$RET"
+        if [ -n "$password" ]; then
+            maas-region createadmin --username "$username" --password "$password" --email "$username@maas"
+        fi
+    fi
+
     # Display installation note
     db_input low maas/installation-note || true
     db_go
 
=== added file 'debian/maas-region-udeb.postinst'
--- debian/maas-region-udeb.postinst	1970-01-01 00:00:00 +0000
+++ debian/maas-region-udeb.postinst	2016-04-07 21:21:25 +0000
@@ -0,0 +1,82 @@
+#!/bin/sh -e
+
+# Source debconf library.
+. /usr/share/debconf/confmodule
+db_version 2.0
+
+# This conf script is capable of backing up
+db_capb backup
+
+logfile=/var/lib/preseed/log
+set_question () {
+	echo "$1 $2 $3 $4" >>"$logfile"
+	if ! db_fget "$2" seen; then
+		db_register debian-installer/dummy "$2"
+		db_subst "$2" ID "$2"
+		db_fget "$2" seen
+	fi
+	if [ "$RET" = false ]; then
+		db_set "$2" "$4"
+		db_fset "$2" seen true
+	fi
+}
+
+
+STATE=1
+while [ "$STATE" != 0 -a "$STATE" != 4 ]; do
+    case "$STATE" in
+    1)
+        # This is a confirmation that we want to install MAAS. If we don't
+        # then we exit the MAAS installation process
+        db_input high maas-region-udeb/maas-confirmation || true
+    ;;
+
+    2)
+        # Ask for username
+        db_get maas-region-udeb/maas-confirmation
+        if [ "$RET" != "true" ]; then
+            break
+        fi
+        db_input critical maas-region-udeb/username || true
+    ;;
+
+    3)
+        # Ask for password
+        db_get maas-region-udeb/username
+        if [ -n "$RET" ]; then
+            db_input critical maas-region-udeb/password || true
+        fi
+    ;;
+
+    esac
+
+    if db_go; then
+        STATE=$(($STATE + 1))
+    else
+        STATE=$(($STATE - 1))
+    fi
+done
+db_capb
+
+db_get maas-region-udeb/maas-confirmation
+if [ "$RET" != "true" ]; then
+   # MAAS won't be installed
+   exit 0
+fi
+# Only preseed username/password combination if both have been
+# input in the installer. If no $password has been input, do not
+# preseed
+db_get maas-region-udeb/username
+username="$RET"
+if [ -n "$username" ]; then
+    db_get maas-region-udeb/password
+    password="$RET"
+    if [ -n "$password" ]; then
+        set_question maas-region-controller maas/username string "$username"
+        set_question maas-region-controller maas/password password "$password"
+    fi
+fi
+# Tell the package manager that we will be installing MAAS
+db_set pkgsel/include maas
+set_question tasksel tasksel/first multiselect "standard, server"
+exit 0
 
=== added file 'debian/maas-region-udeb.templates'
--- debian/maas-region-udeb.templates	1970-01-01 00:00:00 +0000
+++ debian/maas-region-udeb.templates	2016-04-07 21:21:25 +0000
@@ -0,0 +1,29 @@
+Template: debian-installer/maas-region-udeb/title
+Type: text
+_Description: Install your Metal as a Service (MAAS)
+
+Template: maas-region-udeb/maas-confirmation
+Type: boolean
+_Description: Would you like to proceed with the installation of your MAAS?
+ MAAS runs a software-defined data centre - it turns a collection of physical
+ servers and switches into a bare metal cloud with full open source IP address
+ management (IPAM) and instant provisioning on demand.
+ .
+ By choosing to install MAAS, a MAAS Region Controller API server and PostgreSQL
+ database will be installed.
+
+Template: maas-region-udeb/username
+Type: string
+_Description: Username for your MAAS administrator account:
+ MAAS requires an administrative account to be created before you can use MAAS.
+ Please enter the username for the administrator. If no username is provided,
+ you will have to create one before you are able to use MAAS.
+
+Template: maas-region-udeb/password
+Type: password
+_Description: Choose a password for the MAAS administrator account:
+ MAAS requires an administrative account to be created before you can use MAAS.
+ Please enter the password for the administrator's account.
+ .
+ If the password is not entered, your MAAS installation will proceed, but no
+ administrator's account will be created.