lp:~harlowja/cloud-init/encode-resolve-fix

Branch merges

Merged into lp:~cloud-init-dev/cloud-init/trunk at revision 1201

Scott Moser: Approve on 2015-07-31

Diff: 33 lines (+7/-1)

2 files modified

cloudinit/distros/rhel_util.py (+1/-1)
tests/unittests/test_distros/test_resolv.py (+6/-0)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1479988: AttributeError: 'ResolvConf' object has no attribute 'encode'

Undecided

New

Link a bug report

Related blueprints

1131. By Joshua Harlow on 2015-07-30

Ensure that when a resolve conf object is written we pass the str() version of it

Instead of passing the raw object and expecting the write_file to work automatically
make sure we explicitly pass the string version of it so that the write_file routine
can correctly encode/decode it as needed.

1130. By Scott Moser on 2015-07-28

rsyslog: skip empty or None in remotes format

This allows user to specify the following to overwrite a previously
declared entry without warnings.
 rsyslog: {'remotes': {'foo': None}}

1129. By Scott Moser on 2015-07-28

rsyslog: add new format of config

new format of config is namespaced under top level 'rsyslog'
rather than having 3 tokens in the top level namespace.

Additionally added here are:
 * tests
 * support for legacy config
 * support for 'remotes' configuration allowing simple config like
   rsyslog: remotes: {'myremote': "192.168.1.1"}

1128. By Scott Moser on 2015-07-28

_read_dmi_syspath: fix bad log message causing unintended exception

1127. By Scott Moser on 2015-07-22

mounts: support reliably detecting and using Azure ephemeral disks

Azure's ephemeral disks are not guaranteed to be assigned the same name by
the kernel every boot. This causes problems on ~2% of Azure instances, and
can be fixed by using udev rules to give us a deterministic path to mount;
this patch introduces those udev rules and modifies the Azure data source
to use them.

Changes to a couple of config modules were also required. In some places,
they just needed to learn to dereference symlinks. In cc_mounts this
wasn't sufficient because the dereferenced device would have been put in
/etc/fstab (rather defeating the point of using the udev rules in the
first place). A fairly hefty refactor was required to separate "is this a
valid block device?" from "what shall I put in fstab?".

1126. By Scott Moser on 2015-07-22

provide data source to mirror selection code for region-specific mirrors.

This makes the full data source available to the mirror selection code,
which means we can implement region logic on the data source for
everything to use rather than it being mirror-selection-specific.

It also implements that region logic for EC2 and GCE.

1125. By Scott Moser on 2015-07-22

fixes bug: https://launchpad.net/bugs/1461242
ssh: generate ed25519 host keys if supported

now we attempt to generate ed25519 host keys.
If ssh-keygen does not support it, a debug log message will be written.

1124. By Scott Moser on 2015-07-22

packages/debian/control.in: add depends on iproute2

tests (specifically DataSourceOpenNebula) runs 'ip' which comes from
iproute2.

1123. By Scott Moser on 2015-07-21

fix 'make pyflakes'

1122. By Scott Moser on 2015-07-21

tests: fix TestHandlerHandlePart tests

these tests were previously passing, but doing so erroneously.
I believe that an update to mock caused them to start failing.

I've updated the tests now. The simple change is
replacing 'assert_called_with_once' with 'assert_called_once_with'.

The second set of changes is seemingly a correction of the following tests
expectations:
 test_normal_version_2 : was not expecting to get frequency passed into
    handle_part, but should have been.
 test_no_handle_when_modfreq_once: was expecting to have handle_part
    called even though the test implies otherwise.
 test_exception_is_caught: this test just looked broken.
    Now, we're testing that the part handler is called and that no
    exception is raised past handle_part