launchpad-reviewers team mailing list archive

[Andres Rodriguez <andreserl@xxxxxxxxxxxxx>]

Andres Rodriguez has proposed merging lp:~andreserl/maas/packaging_updates_releases into lp:~maas-maintainers/maas/packaging.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~andreserl/maas/packaging_updates_releases/+merge/128971
-- 
https://code.launchpad.net/~andreserl/maas/packaging_updates_releases/+merge/128971
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~andreserl/maas/packaging_updates_releases into lp:~maas-maintainers/maas/packaging.

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-09 16:19:24 +0000
+++ debian/changelog	2012-10-10 15:21:25 +0000
@@ -1,8 +1,34 @@
-maas (0.1+bzr1239+dfsg-0ubuntu1) UNRELEASED; urgency=low
-
-  * New upstream release.
+maas (0.1+bzr1243+dfsg-0ubuntu4) UNRELEASED; urgency=low
+
+  * UNRELEASED
+
+ -- Andres Rodriguez <andreserl@xxxxxxxxxx>  Wed, 10 Oct 2012 11:17:21 -0400
+
+maas (0.1+bzr1243+dfsg-0ubuntu3) quantal; urgency=low
+
+  * 04-fix-ipmi-enlistment.patch: retry maas-enlist without power parameters
+    on failure. This allows enlistment to continue working with Precise
+    ephemeral images before the Precise SRU for maas-enlist lands.
+    (LP: #1064922).
+
+ -- Robie Basak <robie.basak@xxxxxxxxxxxxx>  Wed, 10 Oct 2012 13:29:16 +0000
+
+maas (0.1+bzr1243+dfsg-0ubuntu2) quantal; urgency=low
+
+  * debian/patches/99-ipmi-user-too-long.patch: Fix username too long for
+    IPMI user created on enlistment (LP: #1064832)
+
+ -- Andres Rodriguez <andreserl@xxxxxxxxxx>  Wed, 10 Oct 2012 01:00:29 -0400
+
+maas (0.1+bzr1243+dfsg-0ubuntu1) quantal; urgency=low
+
+  * New upstream release. (LP: #1064596)
   * debian/patches/99-temporary-fix-constraints.patch: Dropped.
-  * debian/control: ${python:Depends} for maas-common.
+  * debian/control:
+    - ${python:Depends} for maas-common.
+    - Add missing Depends for python-maas-provisioningserver (LP: #1064542)
+  * debian/maas-cluster-controller.postinst: Create /var/log/maas if it
+    doesn't exist (LP: #1064539)
 
  -- Andres Rodriguez <andreserl@xxxxxxxxxx>  Mon, 08 Oct 2012 17:02:56 -0400
 

=== modified file 'debian/control'
--- debian/control	2012-10-09 16:19:24 +0000
+++ debian/control	2012-10-10 15:21:25 +0000
@@ -90,7 +90,26 @@
 
 Package: python-maas-provisioningserver
 Architecture: all
-Depends: python-netifaces, ${misc:Depends}, ${python:Depends}
+Depends: python-celery,
+         python-formencode,
+         python-lockfile,
+         python-lxml,
+         python-maas-client,
+         python-netifaces,
+         python-oops,
+         python-oops-amqp,
+         python-oops-datedir-repo,
+         python-oops-twisted,
+         python-pyparsing,
+         python-tempita,
+         python-twisted-core,
+         python-twisted-web,
+         python-txamqp,
+         python-txtftp,
+         python-yaml,
+         python-zope.interface,
+         ${misc:Depends},
+         ${python:Depends}
 Conflicts: python-django-maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
 Replaces: python-django-maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
 Description: Ubuntu MAAS Server

=== modified file 'debian/maas-cluster-controller.postinst'
--- debian/maas-cluster-controller.postinst	2012-10-08 18:33:27 +0000
+++ debian/maas-cluster-controller.postinst	2012-10-10 15:21:25 +0000
@@ -18,9 +18,22 @@
     fi
 }
 
+create_log_dir() {
+    # create log dir
+    if [ ! -d /var/log/maas/oops ]; then
+        mkdir -p /var/log/maas/oops
+    fi
+    # Give appropriate permissions
+    chown -R maas:maas /var/log/maas
+    chmod -R 775 /var/log/maas/oops
+}
+
 if [ "$1" = "configure" ] && [ -z "$2" ]; then
     add_user_group
 
+    # logging
+    create_log_dir
+
     # The local celery config may contain a private cluster UUID.  Only
     # maas can read it; only root can write it.
     chown root:maas /etc/maas/maas_local_celeryconfig_cluster.py
@@ -35,6 +48,11 @@
 fi
 
 if ([ "$1" = "configure" ] && [ -z "$2" ]) || [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
+
+    if dpkg --compare-versions "$2" lt 0.1+bzr1239+dfsg-0ubuntu1; then
+        create_log_dir
+    fi
+
     # Get the MAAS_URL on configure/reconfigure and write it to the conf file.
     db_get maas-cluster-controller/maas-url || true
     if [ -n "$RET" ]; then

=== modified file 'debian/maas-cluster-controller.postrm'
--- debian/maas-cluster-controller.postrm	2012-10-08 17:16:30 +0000
+++ debian/maas-cluster-controller.postrm	2012-10-10 15:21:25 +0000
@@ -11,6 +11,10 @@
                 if getent passwd maas >/dev/null; then
                         deluser maas || true
                 fi
+                # remove log directory
+                if [ -d /var/log/maas ]; then
+                    rm -rf /var/log/maas
+                fi
 esac
 
 #DEBHELPER#

=== added file 'debian/patches/04-fix-ipmi-enlistment.patch'
--- debian/patches/04-fix-ipmi-enlistment.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/04-fix-ipmi-enlistment.patch	2012-10-10 15:21:25 +0000
@@ -0,0 +1,23 @@
+Description: Retry maas-enlist without power parameters on failure
+ Older versions of maas-enlist (such as in Precise) do not support the
+ new power parameters switches and fail when they are provided, so on
+ failure retry without them.
+Forwarded: https://code.launchpad.net/~racb/maas/fix-ipmi-enlistment/+merge/128914
+Author: Robie Basak <robie.basak@xxxxxxxxxxxxx>
+Bug-Ubuntu: https://launchpad.net/bugs/1064922
+Last-Update: 20121010
+
+--- a/contrib/preseeds_v2/enlist_userdata
++++ b/contrib/preseeds_v2/enlist_userdata
+@@ -182,7 +182,10 @@
+    fi
+    power_params=$(maas-ipmi-autodetect --configdir "$IPMI_CONFIG_D" ${pargs} --commission-creds) &&
+      [ -n "${power_params}" ] && power_params=${power_params%.} && power_type=ipmi
+-   maas-enlist --serverurl "$url" ${host:+--hostname "${host}"} ${power_params:+--power-params "${power_params}" --power-type "${power_type}"}>/tmp/enlist.out
++   # Try maas-enlist without power parameters on failure for older versions of
++   # maas-enlist without power parameter support
++   maas-enlist --serverurl "$url" ${host:+--hostname "${host}"} ${power_params:+--power-params "${power_params}" --power-type "${power_type}"}>/tmp/enlist.out ||\
++   maas-enlist --serverurl "$url" ${host:+--hostname "${host}"} >/tmp/enlist.out
+    if [ $? -eq 0 ]; then
+       msg="successfully enlisted to '$url'"
+       [ -n "$host" ] && msg="$msg with hostname '$host'" ||

=== added file 'debian/patches/99-ipmi-user-too-long.patch'
--- debian/patches/99-ipmi-user-too-long.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/99-ipmi-user-too-long.patch	2012-10-10 15:21:25 +0000
@@ -0,0 +1,18 @@
+Description: IPMI user created on enlistment is too long
+ The IPMI user created on enlistment is too long causing that
+ the user is not created. Additionally, this will cause maas
+ to fail to power_on a machine.
+Author: Andres Rodriguez <andreserl@xxxxxxxxxx>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1064832
+
+--- maas-0.1+bzr1243+dfsg.orig/contrib/preseeds_v2/enlist_userdata	2012-10-09 17:19:17.000000000 -0400
++++ maas-0.1+bzr1243+dfsg/contrib/preseeds_v2/enlist_userdata	2012-10-10 00:58:16.355424942 -0400
+@@ -143,7 +143,7 @@
+ 
+        # create user/pass
+        if args.commission_creds:
+-           IPMI_MAAS_USER="maas-commissioning"
++           IPMI_MAAS_USER="maas-commission"
+        else:
+            IPMI_MAAS_USER="maas"
+        IPMI_MAAS_PASSWORD=generate_random_password()

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-10-09 16:19:24 +0000
+++ debian/patches/series	2012-10-10 15:21:25 +0000
@@ -1,3 +1,5 @@
 01-fix-database-settings.patch
 02-pserv-config.patch
 03-txlongpoll-config.patch
+99-ipmi-user-too-long.patch
+04-fix-ipmi-enlistment.patch