Merge ~oddbloke/cloud-init/+git/cloud-init:ubuntu/devel into cloud-init:ubuntu/devel

[Dan Watkins]

[Ryan Harper (raharper)]

I think the post-inst should attempt to remove the existing file cloud-init wrote on upgrade. Thoughts?

[Ryan Harper (raharper)]

After some discussion, it's best to just not emit the file; cleaning up might affect existing systems which may still require this specific setting.

review: Approve

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:c45d5f2cc27236a2038ee5f6bd28e90bea0f1f26
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~daniel-thewatkins/cloud-init/+git/cloud-init/+merge/364162/+edit-commit-message

https://jenkins.ubuntu.com/server/job/cloud-init-ci/625/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/625/rebuild

review: Needs Fixing (continuous-integration)

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 <[e-mail]>  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