Merge lp:~smoser/ubuntu/maverick/cloud-init/lp942961-apt-pipeline into lp:ubuntu/maverick/cloud-init

[Scott Moser]

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2010-09-16 04:28:55 +0000
+++ .pc/applied-patches	2012-03-14 19:23:20 +0000
@@ -1,1 +1,2 @@
 267-do-not-use-ec2-archive-in-vpc.patch
+lp948461-disable-add-configure-apt-pipelining.patch
 
=== modified file 'cloudinit/__init__.py'
--- cloudinit/__init__.py	2010-09-12 15:23:39 +0000
+++ cloudinit/__init__.py	2012-03-14 19:23:20 +0000
@@ -42,6 +42,7 @@
  - ssh-import-id
  - ssh
  - grub-dpkg
+ - apt-pipelining
  - apt-update-upgrade
  - puppet
  - updates-check
 
=== modified file 'debian/changelog'
--- debian/changelog	2010-09-16 04:28:55 +0000
+++ debian/changelog	2012-03-14 19:23:20 +0000
@@ -1,3 +1,12 @@
+cloud-init (0.5.15-0ubuntu3.1) UNRELEASED; urgency=low
+
+  * add ability to configure Acquire::http::Pipeline-Depth via
+    cloud-config setting 'apt_pipelining' (LP: #942061)
+  * debian/cloud-init.postinst: address population of apt_pipeline 
+    setting on installation.
+
+ -- Scott Moser <[e-mail]>  Wed, 14 Mar 2012 14:09:44 -0400
+
 cloud-init (0.5.15-0ubuntu3) maverick; urgency=low
 
   * do not use ec2 ubuntu archive if instance is VPC (LP: #615545)
 
=== modified file 'debian/cloud-init.postinst'
--- debian/cloud-init.postinst	2010-02-05 15:48:21 +0000
+++ debian/cloud-init.postinst	2012-03-14 19:23:20 +0000
@@ -6,6 +6,20 @@
    # disable ureadahead (LP: #499520)
    dpkg-divert --package cloud-init --rename --divert \
       /etc/init/ureadahead.conf.disabled --add /etc/init/ureadahead.conf
+
+   # we want to affect apt_pipelining on install, not wait for
+   # cloud-init to run it on next boot.
+   pipeline_f="/etc/apt/apt.conf.d/90cloud-init-pipelining"
+   if [ -f /var/lib/cloud/data/cache/obj.pkl ]; then
+      cloud-init-cfg apt-pipelining once-per-instance >/dev/null 2>&1 ||
+         echo "Warning: failed to setup apt-pipelining" 1>&2
+   elif [ ! -f "$pipeline_f" ]; then
+      # there was no cloud available, so populate it ourselves.
+      cat > "$pipeline_f" <<EOF
+//Written by cloud-init per 'apt_pipelining'
+Acquire::http::Pipeline-Depth "0";
+EOF
+   fi
 fi
 
 #DEBHELPER#
 
=== added file 'debian/patches/lp948461-disable-add-configure-apt-pipelining.patch'
--- debian/patches/lp948461-disable-add-configure-apt-pipelining.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/lp948461-disable-add-configure-apt-pipelining.patch	2012-03-14 19:23:20 +0000
@@ -0,0 +1,78 @@
+Description: add support for configuring apt http pipelining
+ This allows the user to configure Acquire::http::Pipeline-Depth via
+ cloud-config syntax.
+ .
+ Changes to the debian packaging (cloud-init.postinst) ensure that 
+ initially, the value will be set to '0' (different than its default value)
+ on installation of the package.  For more information on why, please
+ see bug 948461.
+ .
+ This patch is pulled from the upstream cloud-init solution.
+Bug: https://bugs.launchpad.net/ubuntu/+source/cloud-init/+bug/948461
+Author: Scott Moser <[e-mail]>
+--- a/cloudinit/__init__.py
++++ b/cloudinit/__init__.py
+@@ -42,6 +42,7 @@ cloud_config_modules:
+  - ssh-import-id
+  - ssh
+  - grub-dpkg
++ - apt-pipelining
+  - apt-update-upgrade
+  - puppet
+  - updates-check
+--- /dev/null
++++ b/cloudinit/CloudConfig/cc_apt_pipelining.py
+@@ -0,0 +1,53 @@
++# vi: ts=4 expandtab
++#
++#    Copyright (C) 2011 Canonical Ltd.
++#
++#    Author: Ben Howard <[e-mail]>
++#
++#    This program is free software: you can redistribute it and/or modify
++#    it under the terms of the GNU General Public License version 3, as
++#    published by the Free Software Foundation.
++#
++#    This program is distributed in the hope that it will be useful,
++#    but WITHOUT ANY WARRANTY; without even the implied warranty of
++#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++#    GNU General Public License for more details.
++#
++#    You should have received a copy of the GNU General Public License
++#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
++
++import cloudinit.util as util
++from cloudinit.CloudConfig import per_instance
++
++frequency = per_instance
++default_file = "/etc/apt/apt.conf.d/90cloud-init-pipelining"
++
++
++def handle(_name, cfg, _cloud, log, _args):
++
++    apt_pipe_value = util.get_cfg_option_str(cfg, "apt_pipelining", False)
++    apt_pipe_value = str(apt_pipe_value).lower()
++
++    if apt_pipe_value == "false":
++        write_apt_snippet("0", log)
++
++    elif apt_pipe_value in ("none", "unchanged", "os"):
++        return
++
++    elif apt_pipe_value in str(range(0, 6)):
++        write_apt_snippet(apt_pipe_value, log)
++
++    else:
++        log.warn("Invalid option for apt_pipeling: %s" % apt_pipe_value)
++
++
++def write_apt_snippet(setting, log, f_name=default_file):
++    """ Writes f_name with apt pipeline depth 'setting' """
++
++    acquire_pipeline_depth = 'Acquire::http::Pipeline-Depth "%s";\n'
++    file_contents = ("//Written by cloud-init per 'apt_pipelining'\n"
++                     + (acquire_pipeline_depth % setting))
++
++    util.write_file(f_name, file_contents)
++
++    log.debug("Wrote %s with APT pipeline setting" % f_name)
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2010-09-16 04:28:55 +0000
+++ debian/patches/series	2012-03-14 19:23:20 +0000
@@ -1,1 +1,2 @@
 267-do-not-use-ec2-archive-in-vpc.patch
+lp948461-disable-add-configure-apt-pipelining.patch