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

[Scott Moser]

=== modified file 'cloudinit/CloudConfig.py'
--- cloudinit/CloudConfig.py	2010-12-02 09:42:17 +0000
+++ cloudinit/CloudConfig.py	2012-03-14 19:22:19 +0000
@@ -41,6 +41,7 @@
         self.cloud = cloudinit.CloudInit()
         self.cfg = self.get_config_obj(cfgfile)
         self.cloud.get_data_source()
+        self.add_handler('apt-pipelining', self.h_apt_pipelining)
         self.add_handler('apt-update-upgrade', self.h_apt_update_upgrade)
         self.add_handler('config-ssh')
         self.add_handler('disable-ec2-metadata',
@@ -435,6 +436,34 @@
             warn("Failed to run debconf-set-selections for grub-dpkg")
             warn(traceback.format_exc())
 
+    def h_apt_pipelining(self, name, args):
+        # handle configuration of apt pipelining
+
+        apt_pipe_value = util.get_cfg_option_str(self.cfg,
+            "apt_pipelining", False)
+        apt_pipe_value = str(apt_pipe_value).lower()
+
+        if apt_pipe_value == "false":
+            write_apt_snippet("0")
+
+        elif apt_pipe_value in ("none", "unchanged", "os"):
+            return
+
+        elif apt_pipe_value in str(range(0, 6)):
+            write_apt_snippet(apt_pipe_value)
+
+        else:
+            warn("Invalid option for apt_pipeling: %s" % apt_pipe_value)
+
+
+def write_apt_snippet(setting, f_name="/etc/apt/apt.conf.d/90cloud-init-pipelining"):
+    """ 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)
     
 def apply_credentials(keys, user, disable_root):
     keys = set(keys)

=== modified file 'debian/changelog'
--- debian/changelog	2010-12-02 09:42:17 +0000
+++ debian/changelog	2012-03-14 19:22:19 +0000
@@ -1,3 +1,12 @@
+cloud-init (0.5.10-0ubuntu1.7) 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:45:45 -0400
+
 cloud-init (0.5.10-0ubuntu1.5) lucid-proposed; urgency=low
 
   * make grub-config code run on instance first boot so user is not

=== 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:22:19 +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#