launchpad-reviewers team mailing list archive

[Andres Rodriguez <andreserl@xxxxxxxxxxxxx>]

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

Requested reviews:
  Andres Rodriguez (andreserl)
  Launchpad code reviewers (launchpad-reviewers)

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

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-08 18:33:27 +0000
+++ debian/changelog	2012-10-08 20:55:22 +0000
@@ -1,8 +1,12 @@
-maas (0.1+bzr1223+dfsg-0ubuntu1~ppa1) quantal; urgency=low
+maas (0.1+bzr1223+dfsg-0ubuntu1) UNRELEASED; urgency=low
 
   * New upstream release. (LP: #1062518)
 
   [ Julian Edwards ]
+  * Split packaging of 'maas' into maas-{region,cluster}-controller
+    - debian/control: Update accordingly.
+    - debian/*.install: Move files accordingly
+    - debian/*.{postinst,postrm,preinst}: Move files accordingly.
   * Ensure isc-dhcp-server is disabled when installing maas-dhcp.
   * Ensure maas-dns creates the maas user before trying to chown files.
   * Make maas-cluster-controller autoconfigure itself when upgrading from the
@@ -11,6 +15,21 @@
     are cleaned up. (LP: #1059973)
 
   [ Raphaël Badin ]
+  * Install maas_local_celeryconfig.py in /etc/maas and symlink to
+    /usr/share/maas.
+  * debian/maas.postinst: Create rabbitmq celery user/vhost.
+  * debian/maas.postinst: Update BROKER_URL in maas_local_celeryconfig.py.
+  * Use maas_local_celeryconfig_cluster.py as the local celery
+    configuration file for the cluster worker.
+  * debian/maas-region-controller.maas-region-celery.upstart: Add region
+    worker upstart script.
+  * Rename cluster worker upstart script into
+    maas-cluster-controller.maas-clluster-celery.upstart.
+  * maas-cluster-controller.maas-celery.upstart: use "celeryconfig_cluster"
+    as the Celery config module.
+  * debian/maas-common.install: Install celeryconfig_common.py.
+  * debian/maas-cluster-controller.install: Install celeryconfig_cluster.py.
+  * debian/maas-region-controller.install: Install celeryconfig.py.
   * Split celery config into cluster and region configs.
   * Add region celeryd upstart config.
   * Define CELERY_CONFIG_MODULE in
@@ -23,6 +42,30 @@
     the maas user/group have been created
 
   [ Andres Rodriguez ]
+  * debian/maas.postinst:
+    - Always restart apache2.
+    - Handle upgrades for new upstream release.
+    - Handle upgrades for celery rabbitmq worker.
+  * Add binary package to install client tool.
+    - debian/extras/maas-cli: Add binary.
+    - debian/maas-cli.install: Add. Install maascli and apiclient.
+    - debian/control: Add binary package.
+  * debian/control:
+    - Depends on freeipmi-tools instead of ipmitool.
+    - Conflicts/Replaces on maas for python-maas-client.
+    - Depends on python-netifaces, python-lxml.
+  * Add python-maas-client binary package:
+    - debian/python-maas-client.install: Add. Install 'apiclient' python module.
+    - debian/control: Add package. python-django-maas and maas-cli now
+      Depend on it.
+  * debian/rules: Install maas-dhcp-server upstart job.
+  * debian/maas.postrm: Remove celery worker rabbitmq user and host.
+  * debian/extras/99-maas-sudoers: Add for maas-dhcp-server upstart job
+    instead of isc-dhcp-server (LP: #1055951)
+  * debian/maas-region-controller.postinst: Cleanup upgrade rules.
+  * debian/maas-cluster-controller.postinst: Fix 'local' usage.
+  * debian/maas-common.install: Install celeryconfig in appropriate location.
+  * debian/maas-cluster-controller.postrm: Add and delete maas user.
   * debian/maas-dhcp.postinst: Stop isc-dhcp-server not isc_dhcp_server.
   * debian/maas-region-controller.postinst:
     - Always update passwords on upgrade. No longer check versioning. (LP: #1060094).
@@ -30,8 +73,7 @@
     - Source dbconfig conf file for maas-region-controller on upgrade because
       it writes a new config file and no longer preservers the previous password.
   * debian/maas-cluster-controller.maas-cluster-celery.upstart: Remove set{uid/gid}.
-  * debian/control: Depends on python-netifaces, python-lxml.
-  * debian/maas-region-controller: Install maas-import-squashfs
+  * debian/maas-region-controller.install: Install maas-import-squashfs
   * Handle removal of non existant files (LP: #1059556):
     - debian/maintscript: Added to handle removal of conffiles.
     - debian/control: Add Pre-depends and bump debhelper version.
@@ -40,49 +82,13 @@
     appropriate etc dir.
   * debian/maas-cluster-controller.config: Source debconf at the beginning of the
     script. (LP: #1063857)
-  * debian/maas-cluster-controller.postinst: Only set URL if not empty.
+  * debian/patches/99-temporary-fix-constraints.patch: Fix constraints maaping
+    when deploying with juju. Temporary until it gets merged upstream
 
   [ Robie Basak ]
   * Add maas-cluster-controller dependency on uuid-runtime, needed for uuidgen
     by postinst.
 
- -- Andres Rodriguez <andreserl@xxxxxxxxxx>  Mon, 08 Oct 2012 13:10:23 -0400
-
-maas (0.1+bzr1110+dfsg-0ubuntu1) quantal; urgency=low
-
-  * New Upstream Release
-
-  [ Julian Edwards ]
-  * Split packaging of 'maas' into maas-{region,cluster}-controller
-    - debian/control: Update accordingly.
-    - debian/*.install: Move files accordingly
-    - debian/*.{postinst,postrm,preinst}: Move files accordingly.
-
-  [ Andres Rodriguez ]
-  * debian/maas-region-controller.postinst: Cleanup upgrade rules.
-  * debian/maas-cluster-controller.postinst: Fix 'local' usage.
-  * debian/maas-common.install: Install celeryconfig in appropriate location.
-  * debian/maas-cluster-controller.postrm: Add and delete maas user.
-
-  [ Raphael Badin ]
-  * Use maas_local_celeryconfig_cluster.py as the local celery
-    configuration file for the cluster worker.
-  * debian/maas-region-controller.maas-region-celery.upstart: Add region
-    worker upstart script.
-  * Rename cluster worker upstart script into
-    maas-cluster-controller.maas-clluster-celery.upstart.
-  * maas-cluster-controller.maas-celery.upstart: use "celeryconfig_cluster"
-    as the Celery config module.
-  * debian/maas-common.install: Install celeryconfig_common.py.
-  * debian/maas-cluster-controller.install: Install celeryconfig_cluster.py.
-  * debian/maas-region-controller.install: Install celeryconfig.py.
-
- -- Andres Rodriguez <andreserl@xxxxxxxxxx>  Fri, 28 Sep 2012 16:54:28 -0400
-
-maas (0.1+bzr1063+dfsg-0ubuntu1) quantal; urgency=low
-
-  * New upstream release
-
   [ Scott Moser ]
   * debian/maas-dhcp.{install,apparmor,postrm} install apparmor profile into
     /etc/apparmor.d/dhcpd.d (LP: #1049177), and update apparmor profile for
@@ -96,34 +102,7 @@
     - debian/tests/maas-package-test: Add
     - tests/maas-integration.py: Add
 
-  [ Andres Rodriguez ]
-  * debian/maas.postinst:
-    - Always restart apache2.
-    - Handle upgrades for new upstream release.
-    - Handle upgrades for celery rabbitmq worker.
-  * Add binary package to install client tool.
-    - debian/extras/maas-cli: Add binary.
-    - debian/maas-cli.install: Add. Install maascli and apiclient.
-    - debian/control: Add binary package.
-  * debian/control:
-    - Depends on freeipmi-tools instead of ipmitool.
-    - Conflicts/Replaces on maas for python-maas-client
-  * Add python-maas-client binary package:
-    - debian/python-maas-client: Add. Install 'apiclient' python module.
-    - debian/control: Add package. python-django-maas and maas-cli now
-      Depend on it.
-  * debian/rules: Install maas-dhcp-server upstart job.
-  * debian/maas.postrm: Remove celery worker rabbitmq user and host.
-  * debian/extras/99-maas-sudoers: Add for maas-dhcp-server upstart job
-    instead of isc-dhcp-server (LP: #1055951)
-
-  [ Raphael Badin ]
-  * Install maas_local_celeryconfig.py in /etc/maas and symlink to
-    /usr/share/maas.
-  * debian/maas.postinst: Create rabbitmq celery user/vhost.
-  * debian/maas.postinst: Update BROKER_URL in maas_local_celeryconfig.py.
-
- -- Andres Rodriguez <andreserl@xxxxxxxxxx>  Wed, 19 Sep 2012 14:47:04 -0400
+ -- Andres Rodriguez <andreserl@xxxxxxxxxx>  Mon, 08 Oct 2012 13:10:23 -0400
 
 maas (0.1+bzr971+dfsg-0ubuntu2) quantal; urgency=low
 

=== added file 'debian/patches/99-temporary-fix-constraints.patch'
--- debian/patches/99-temporary-fix-constraints.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/99-temporary-fix-constraints.patch	2012-10-08 20:55:22 +0000
@@ -0,0 +1,31 @@
+Index: maas-0.1+bzr1223+dfsg.orig/src/maasserver/api.py
+===================================================================
+--- maas-0.1+bzr1223+dfsg.orig.orig/src/maasserver/api.py	2012-10-08 13:45:42.932085138 -0400
++++ maas-0.1+bzr1223+dfsg.orig/src/maasserver/api.py	2012-10-08 14:47:34.372180169 -0400
+@@ -691,6 +691,14 @@
+     'mem': 'memory',
+     }
+ 
++# Map the arch constraint as passed in the request to the name of the
++# arch/subarch in the database.
++_constraints_arch_map = {
++    'i386': 'i386/generic',
++    'amd64': 'amd64/generic',
++    'armhf': 'armhf/highbank',
++    }
++
+ 
+ def extract_constraints(request_params):
+     """Extract a dict of node allocation constraints from http parameters.
+@@ -704,7 +712,10 @@
+     for request_name in _constraints_map:
+         if request_name in request_params:
+             db_name = _constraints_map[request_name]
+-            constraints[db_name] = request_params[request_name]
++            if request_params[request_name] in _constraints_arch_map:
++                constraints[db_name] = _constraints_arch_map[request_params[request_name]]
++            else:
++                constraints[db_name] = request_params[request_name]
+     return constraints
+ 
+ 

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-09-14 19:57:07 +0000
+++ debian/patches/series	2012-10-08 20:55:22 +0000
@@ -1,3 +1,4 @@
 01-fix-database-settings.patch
 02-pserv-config.patch
 03-txlongpoll-config.patch
+99-temporary-fix-constraints.patch