Merge ~smoser/cloud-init:feature/ubuntu-apport-hook into cloud-init:ubuntu/devel

[Scott Moser]

debian/rules, debian/apport-launcher.py: add an apport hook.

Add the apport launcher that takes advantage of the newly added
cloudinit.apport.

[Scott Moser (smoser)]

https://code.launchpad.net/~chad.smith/cloud-init/+git/cloud-init/+merge/330626
is where the collect-logs and apport support come from.

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

PASSED: Continuous integration, rev:80af9911c65ec99681b0ab872ae2935dffd98022
https://jenkins.ubuntu.com/server/job/cloud-init-ci/314/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    SUCCESS: MAAS Compatability Testing
    IN_PROGRESS: Declarative: Post Actions

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

review: Approve (continuous-integration)

[Chad Smith (chad.smith)]

+1 on this content

review: Approve

diff --git a/debian/apport-launcher.py b/debian/apport-launcher.py
new file mode 100644
index 0000000..30fea31
--- /dev/null
+++ b/debian/apport-launcher.py
@@ -0,0 +1,6 @@
+'''Wrapper for cloudinit apport interface'''
+
+from cloudinit.apport import add_info as cloudinit_add_info
+
+def add_info(report, ui):
+    return cloudinit_add_info(report, ui)
diff --git a/debian/changelog b/debian/changelog
index a320cc7..1101f0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cloud-init (0.7.9-267-g922c3c5c-0ubuntu2) UNRELEASED; urgency=medium
+
+  * debian/rules, debian/apport-launcher.py: add an apport hook.
+
+ -- Scott Moser <[e-mail]>  Fri, 15 Sep 2017 15:07:50 -0400
+
 cloud-init (0.7.9-267-g922c3c5c-0ubuntu1) artful; urgency=medium
 
   * New upstream snapshot.
diff --git a/debian/rules b/debian/rules
index ea815e4..cf18c10 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,3 +20,4 @@ override_dh_auto_install:
 	install -D ./tools/21-cloudinit.conf debian/cloud-init/etc/rsyslog.d/21-cloudinit.conf
 	install -D ./tools/Z99-cloud-locale-test.sh debian/cloud-init/etc/profile.d/Z99-cloud-locale-test.sh
 	install -D ./tools/Z99-cloudinit-warnings.sh debian/cloud-init/etc/profile.d/Z99-cloudinit-warnings.sh
+	install -m 0644 -D debian/apport-launcher.py debian/cloud-init/usr/share/apport/package-hooks/cloud-init.py