~shane.davidson/cloud-init:update-openstack-datasource

Last commit made on 2017-06-21
Get this branch:
git clone -b update-openstack-datasource https://git.launchpad.net/~shane.davidson/cloud-init
Only Shane Davidson can upload to this branch. If you are Shane Davidson please log in for upload directions.

Branch merges

Branch information

Name:
update-openstack-datasource
Repository:
lp:~shane.davidson/cloud-init

Recent commits

277295e... by root <email address hidden>

update datasource to use vendor_data and vendor_data2 and merge values

7fae46b... by root <email address hidden>

add inital support for vendor_data2.json as described in https://docs.openstack.org/developer/nova/vendordata.html

043d838... by root <email address hidden>

update openstack metadata versions

ecb408a... by Scott Moser

FreeBSD: Make freebsd a variant, fix unittests and tools/build-on-freebsd.

 - Simplify the logic of 'variant' in util.system_info
   much of the data from
   https://github.com/hpcugent/easybuild/wiki/OS_flavor_name_version
 - fix get_resource_disk_on_freebsd when running on a system without
   an Azure resource disk.
 - fix tools/build-on-freebsd to replace oauth with oauthlib and add
   bash which is a dependency for tests.
 - update a fiew places that were checking for freebsd but not using
   the util.is_FreeBSD()

9ccb8f5... by Scott Moser

FreeBSD: fix test failure

The previous commit caused test failure.
This separates out _check_freebsd_cdrom and mocks it in a test
rather than patching open.

ea0a534... by Hongjiang Zhang

FreeBSD: replace ifdown/ifup with "ifconfig down" and "ifconfig up".

Fix the issue caused by different commands on Linux and FreeBSD. On Linux,
we used ifdown and ifup to enable and disable a NIC, but on FreeBSD, the
counterpart is "ifconfig down" and "ifconfig up".

LP: #1697815

8a06a12... by Hongjiang Zhang

FreeBSD: fix cdrom mounting failure if /mnt/cdrom/secure did not exist.

The current method is to attempt to mount the cdrom (/dev/cd0), if it is
successful, /dev/cd0 is configured, otherwise, it is not configured. The
problem is it forgets to check whether the mounting destination folder is
created or not. As a result, mounting attempt failed even if cdrom is
ready.

LP: #1696295

977c4cf... by Andrew Jorgensen

main: Don't use templater to format the welcome message

Some versions of Cheetah returned everything as unicode by default (not
utf-8 or ascii) and some varieties of syslog would choke on unicode.
Jinja2 is probably fine, but Python's format() is perfectly adequate for
a short message like the welcome message.

Reviewed-by: Tom Kirchner <email address hidden>
Reviewed-by: Ben Cressey <email address hidden>

1025e49... by Chad Smith

docs: Automatically generate module docs form schema if present.

We have started adding jsonschema definitions for cloudconfig modules
(cc_ntp). This branch allows us render sphinx docs using the module's
shema definition instead of using the module's docstring.

This allows us to avoid duplicating schema documentation in the
module-level docstring and schema definition. The corresponding module
documentation is extended a bit to differentiate between config schema and
potential examples.

777f6ca... by Jens Sandmann

debian: fix path comment in /etc/hosts template.

The comments in the debian template file of /etc/hosts still pointed
to a general template file instead of the debian one.

LP: #1606406