~raharper/cloud-init:ubuntu/devel/newupstream-20180914

Branch merges

Propose for merging

Merged into cloud-init:ubuntu/devel at revision d418088c4cb2176ee4e1e73e3a3aa7f91e8436e1

Server Team CI bot: Approve (continuous-integration) on 2018-09-14

cloud-init Commiters: Pending requested 2018-09-14

Diff: 1911 lines (+1094/-115)

32 files modified

bash_completion/cloud-init (+2/-0)
cloudinit/cmd/devel/__init__.py (+25/-0)
cloudinit/cmd/devel/parser.py (+4/-1)
cloudinit/cmd/devel/render.py (+90/-0)
cloudinit/cmd/devel/tests/test_render.py (+101/-0)
cloudinit/cmd/main.py (+15/-1)
cloudinit/handlers/__init__.py (+8/-3)
cloudinit/handlers/boot_hook.py (+5/-7)
cloudinit/handlers/cloud_config.py (+5/-10)
cloudinit/handlers/jinja_template.py (+137/-0)
cloudinit/handlers/shell_script.py (+3/-6)
cloudinit/handlers/upstart_job.py (+3/-6)
cloudinit/helpers.py (+4/-0)
cloudinit/log.py (+10/-2)
cloudinit/net/__init__.py (+7/-0)
cloudinit/net/tests/test_init.py (+8/-3)
cloudinit/sources/__init__.py (+31/-16)
cloudinit/sources/helpers/openstack.py (+18/-1)
cloudinit/sources/tests/test_init.py (+61/-14)
cloudinit/stages.py (+14/-8)
cloudinit/templater.py (+25/-3)
cloudinit/tests/helpers.py (+9/-0)
debian/changelog (+11/-0)
doc/rtd/topics/capabilities.rst (+12/-3)
doc/rtd/topics/datasources.rst (+47/-0)
doc/rtd/topics/format.rst (+17/-4)
tests/cloud_tests/testcases/base.py (+4/-4)
tests/unittests/test_builtin_handlers.py (+302/-22)
tests/unittests/test_datasource/test_openstack.py (+91/-1)
tests/unittests/test_handler/test_handler_etc_hosts.py (+1/-0)
tests/unittests/test_handler/test_handler_ntp.py (+1/-0)
tests/unittests/test_templating.py (+23/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

d418088... by Ryan Harper on 2018-09-14

releasing cloud-init version 18.3-44-g84bf2482-0ubuntu1

be7f59a... by Ryan Harper on 2018-09-14

update changelog (New upstream snapshot 18.3-44-g84bf2482).

e6933f2... by Ryan Harper on 2018-09-14

merge from upstream/master at 18.3-44-g84bf2482

84bf248... by Scott Moser on 2018-09-14

bash_completion/cloud-init: fix shell syntax error.

A syntax error creeped in with commit c7555762f3a3.

12066fc... by Scott Moser on 2018-09-13

EphemeralIPv4Network: Be more explicit when adding default route.

On OpenStack based OVH public cloud, we got DHCP response with
  fixed-address 54.36.113.86;
  option subnet-mask 255.255.255.255;
  option routers 54.36.112.1;

The router clearly is not on the subnet. So 'ip' would fail when
we tried to add the default route.
The solution here is to add an explicit route on that interface
to the router and then add the default route.

Also add 'bgpovs' to the list of 'physical' types for OpenStack
network configuration. That type is used on OVH public cloud.

LP: #1792415

4361e0e... by Scott Moser on 2018-09-13

OpenStack: support reading of newer versions of metdata.

Mark as supported for reading some newer versions of openstack metadata:
 2016-06-30 : Newton one
 2016-10-06 : Newton two
 2017-02-22 : Ocata
 2018-08-27 : Rocky

c75c582... by Scott Moser on 2018-09-12

OpenStack: fix bug causing 'latest' version to be used from network.

Cloud-init was reading a list of versions from the OpenStack metadata
service (http://169.254.169.254/openstack/) and attempt to select the
newest known supported version. The problem was that the list
of versions was not being decoded, so we were comparing a list of
bytes (found versions) to a list of strings (known versions).

LP: #1792157

c755576... by Chad Smith on 2018-09-11

user-data: jinja template to render instance-data.json in cloud-config

Allow users to provide '## template: jinja' as the first line or their
#cloud-config or custom script user-data parts. When this header exists,
the cloud-config or script will be rendered as a jinja template.

All instance metadata keys and values present in
/run/cloud-init/instance-data.json will be available as jinja variables
for the template. This means any cloud-config module or script can
reference any standardized instance data in templates and scripts.

Additionally, any standardized instance-data.json keys scoped below a
'<v#>' key will be promoted as a top-level key for ease of reference in
templates. This means that '{{ local_hostname }}' is the same as using the
latest '{{ v#.local_hostname }}'.

Since instance-data is written to /run/cloud-init/instance-data.json, make
sure it is persisted across reboots when the cached datasource opject is
reloaded.

LP: #1791781

0e8a1bc... by Ryan Harper on 2018-09-10

releasing cloud-init version 18.3-39-g757247f9-0ubuntu1

344f69a... by Ryan Harper on 2018-09-10

update changelog (New upstream snapshot 18.3-39-g757247f9).