~chad.smith/cloud-init:collect-logs

Branch merges

Merged into cloud-init:master at revision e626966ee7d339b53d2c8b14a8f2ff8e3fe892ee

Server Team CI bot: Approve (continuous-integration) on 2017-09-15

Scott Moser: Approve on 2017-09-15

Diff: 439 lines (+354/-6)

7 files modified

cloudinit/apport.py (+105/-0)
cloudinit/cmd/devel/logs.py (+101/-0)
cloudinit/cmd/devel/tests/__init__.py (+0/-0)
cloudinit/cmd/devel/tests/test_logs.py (+120/-0)
cloudinit/cmd/main.py (+10/-1)
packages/debian/rules.in (+1/-0)
tests/unittests/test_cli.py (+17/-5)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

ef77fe4... by Chad Smith on 2017-09-15

address review comments on license, dpkg-query structuring, docstrings. And dropped the optional newline append to cmd output

dba1e05... by Chad Smith on 2017-09-15

add optional --include-userdata param to collect-logs. make the apport import optional

c83e0ba... by Chad Smith on 2017-09-15

move cloud-init.pt -> cloudinit.apport. Add systemd-ordering tag to apport.py bug if we see Breaking ordering cycle per bug 1717477. Drop upstream inclusion of cloud-init.py, we will have to carry a minimal patch to deliver apport functionality to ubuntu releases

04260ae... by Chad Smith on 2017-09-15

unit tests validate that we add a trailing newline to cmd content if it does not already have a newline

327f3ee... by Chad Smith on 2017-09-15

flakes and ProcessExecutionError instead of CalledProcessError

6d93c8c... by Chad Smith on 2017-09-15

add _write_command_output_to_file helper function per review comments

e06880a... by Chad Smith on 2017-09-15

Address smoser's review comments:

 - update collect-logs help summary "logs" -> "debug info"
 - fixup imports in apport cloud-init.py, separate VMware and OVF cloud
   choices, grep cloud-init.log for warnings or errors, use existing
   /var/lib/cloud/instance/user-data.txt instead of asking them to create
   /run/cloud-init/user-data.txt
 - fixup collect-logs (log.py) to use tempdir for log-dir creation, add
   newline in version file, cloudconfig-schema -> collect-logs copy paste error
   add vi comment to end of file

66dad59... by Chad Smith on 2017-09-13

comment typos and 80 char line width

1efed63... by Chad Smith on 2017-09-13

docstring fixup

7a2ae7b... by Chad Smith on 2017-09-13

rules.in updates to include apport package-hooks