cloud-init-dev team mailing list archive

[Dan Watkins <daniel.watkins@xxxxxxxxxxxxx>]

Dan Watkins has proposed merging ~daniel-thewatkins/cloud-init/+git/cloud-init:ubuntu/devel into cloud-init:ubuntu/devel.

Requested reviews:
  cloud-init commiters (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~daniel-thewatkins/cloud-init/+git/cloud-init/+merge/364162
-- 
Your team cloud-init commiters is requested to review the proposed merge of ~daniel-thewatkins/cloud-init/+git/cloud-init:ubuntu/devel into cloud-init:ubuntu/devel.

diff --git a/debian/changelog b/debian/changelog
index 61f09d7..c17e38b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cloud-init (18.5-44-g7c07af28-0ubuntu2) disco; urgency=medium
+
+  * d/postinst: remove now-incorrect apt pipelining configuration
+
+ -- Daniel Watkins <oddbloke@xxxxxxxxxx>  Fri, 08 Mar 2019 09:56:42 -0500
+
 cloud-init (18.5-44-g7c07af28-0ubuntu1) disco; urgency=medium
 
   * New upstream snapshot.
diff --git a/debian/cloud-init.postinst b/debian/cloud-init.postinst
index f88d1c5..93d58e2 100644
--- a/debian/cloud-init.postinst
+++ b/debian/cloud-init.postinst
@@ -297,20 +297,6 @@ datasource_list: [ $values ]
 EOF
    fi
 
-   # 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/instance/obj.pkl ]; then
-      cloud-init single --name apt-pipelining --frequency once >/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
-
    # if there are maas settings pre-seeded apply them
    handle_preseed_maas