Merge lp:~cloud-init-dev/cloud-init/trunk into lp:~hannes-georg-0/cloud-init/add_mkswap_force_flag

[Hannes]

Hi

The force field table in cc_disk_setup lacks an entry for swap.

Thank you
Hannes

[lp:~cloud-init-dev/cloud-init/trunk]

1223. By Dan Watkins on 2016-06-02

Improve merging documentation

1224. By Scott Moser on 2016-06-03

Apt sources configuration improvements

- keyid-only (no source statement)
- key only (no source statement)
- custom source.list template
- support long gpg key fingerprints with spaces
- fix issue with key's that were already in the local gpg keyring
- allowing a new format to specify apt_sources in a dictionary instead of a
  list to allow merging of configurations

1225. By Scott Moser on 2016-06-03

improve network configuration

This branch accomplishes several things:
 - centrally handle 'dsmode' to be 'local' or 'net.
   This allows local data sources to run before networking
   but still have user-data read by default when networking is available.

 - support networking information being read on dreamcompute
   dreamcompute's openstack declares networking via the
   /etc/network/interfaces style 'network_config' format.

 - support reading and applying networking information on SmartOS

 - improve reading networking from openstack network_data.json (LP: #1577982)
   add support for mtu and routes and many miscellaneous fixes.

 - support for renaming devices in a container (LP: #1579130).
   Also rename network devices as instructed by the host on
   every boot where cloud-init networking is enabled. This is required
   because a.) containers do not get systemd.link files applied
   as they do not have udev. b.) if the initramfs is out of date
   then we need to apply them.

 - remove blocking of udev rules (LP: #1577844, LP: #1571761)

1226. By Scott Moser on 2016-06-04

tests: fix apt tests to run inside ubuntu build environment

This just mocks out use of lsb_release as it is not available
in a build environment.
Additionally mocks out use of getkeybyid. This admittedly
makes the test for a long key fingerprint not useful as it was
broken only inside getkeybyid.

Also fix 'make yaml' for cloud-config.txt

1227. By Scott Moser on 2016-06-05

skip test_apt_source_list_debian_mirrorfail for now

I've opened bug 1589174 with the intent to fix these tests
that I quickly fixed in the last 2 commits. Those were done
in haste so that we could get a functional trunk build again.

1228. By Scott Moser on 2016-06-07

make networking config provided in system config override datasource.

while datasource provided networking is more dynamic in most cases,
preference should still be given to networking configuration provided
in the system.

This is because the user of the image should be ultimately in control
of the networking configuration if they so choose.

1229. By Scott Moser on 2016-06-10

Change missing Cheetah log warning to debug [Andrew Jorgensen]

In the absence of cheetah, which is a fairly heavy templating engine, and
not strictly needed by anything in cloud-init, the only warning we saw in
the logs was this one from the templater. Degrading this to a debug
message makes any other warnings more relevant.

1230. By Scott Moser on 2016-06-10

Fix apt configure unittests to run in more environments

As well as some improvements that were found along testing them and due to
the fact that we review some of that code again in the scope of curtin
currently.

Tests:
 - add a test for an alternate keyserver
 - harden mirrorfail tests to detect and skip if no network is available
 - improve apt_source related tests to work on CentOS7

Changes:
 - gpg key handling is now in python instead of a shell blob and moved
   to its own module.
 - packages/bddeb has an option to sign as someone else than smoser
 - make exception handling of apt_source features more specific
   (do not catch broad 'Exception')
 - rename some functions to reflect better what they actually do
 - capture some helper subp calls output to avoid spilling into stdout when
   not intended

1231. By Scott Moser on 2016-06-10

clean up temp files made in tests

After a 'tox' run, now there are no tmpdirs left in /tmp.

1232. By Joshua Harlow on 2016-06-10

Refactor a large part of the networking code.

Splits off distro specific code into specific files so that
other kinds of networking configuration can be written by the
various distro(s) that cloud-init supports.

It also isolates some of the cloudinit.net code so that it can
be more easily used on its own (and incorporated into other
projects such as curtin).

During this process it adds tests so that the net process can
be tested (to some level) so that the format conversion processes
can be tested going forward.

1233. By Joshua Harlow on 2016-06-10

Fix the broken import and 'parse_net_config_data' function usage

1234. By Dan Watkins on 2016-06-13

Remove trailing dot from GCE metadata URL (LP: #1581200) [Phil Roche]

1235. By Scott Moser on 2016-06-14

[Revert] Remove trailing dot from GCE metadata URL

This change broke tox tests.

1236. By Scott Moser on 2016-06-14

fix pep8 failure introduced in recent commit.

The commit 1232 (Refactor a large part of the networking code) broke pep8.

1237. By Dan Watkins on 2016-06-15

Re-apply "Remove trailing dot from GCE metadata URL (LP: #1581200) [Phil Roche]"

This commit includes the content of that commit, plus a fix for the tests
(provided by Phil).

1238. By Scott Moser on 2016-06-16

move 'main' into cloudinit/cmd/ for easier testing

This moves bin/cloud-init's content into cloudinit/cmd/main.py,
and then fixes the pep8/flake8 issues with that.

The end result is easier testing of main.

1239. By Scott Moser on 2016-06-16

fix some errors reported by pylint

pylint --errors-only found several errors. Some of the changes
here represent real errors, others just code that pylint did
not like.

1240. By Scott Moser on 2016-06-16

fix usage of OSError.message that will not work in python3

python3's OSError does not have a .message attribute.

1241. By Scott Moser on 2016-06-16

DataSourceNoCloud: fix stack trace on reboot, default to dsmode=net

On reboot (loading module from obj.pkl) we would hit a AttributeError
when trying to access cmdline_id.
Addtionally, dsmode was inadvertantly defaulting to local for
DataSourceNoCloud.

1242. By Scott Moser on 2016-06-16

support network rendering to sysconfig (for centos and RHEL)

This intends to add support for rendering of network data under sysconfig
distributions (centos and rhel). The end result will be support for
network configuration via ConfigDrive or NoCloud on these OS.

1243. By Scott Moser on 2016-06-20

do not render systemd.link files

When fixing bug 1579130, we made cloud-init rename devices itself,
rather than relying on the systemd.link files to do that.
That was necessary to
 - rename devices in a container
 - rename devices on first boot or in any situation when the
   link files in the initramfs were stale.

However, cloud-init was still writing .link files like:
 /etc/systemd/network/50-cloud-init-ens2.link

That leads to just a confusing situation as cloud-init will trump
any renaming systemd does in all cases.

Also added here is a header into the rendered ENI file:
 /etc/network/interfaces.d/50-cloud-init.cfg

that describes how to disable cloud-init networking.

1244. By Scott Moser on 2016-06-21

write_files: if no permissions are given, just use default without warn.

if no permissions were given in a write_files stanza, then
a warning would be emitted.

The fix here is just to special case handling of None.

1245. By Scott Moser on 2016-06-22

user_data: fix error when user-data is not utf-8 decodable

when user-data was not decodable, cloud-init would raise exception.
This also changes the signature of user_data.convert_string.
The 'headers' argument was never used, and woudl have been broken
if it was, as it was expected to be a dictionary but then was
passed in with *headers.

1246. By Scott Moser on 2016-06-27

fix restoring from a datasource that did not have dsmode

On upgrade and reboot, if datasource restored from obj.pkl did not have
a dsmode attribute, then 'init --local' would fail due to stack trace.

1247. By Scott Moser on 2016-06-28

distros/debian.py: fix calling of eni renderer to not render link files

Under revno 1243 a failed attempt was made to not render systemd.link
files into /etc/systemd/network/ . The 'config' that was passed in was
incorrect though, and resulted in link files still getting rendered.

(original bug was LP: #1594546).

1248. By Joshua Harlow on 2016-07-13

Dict comprehensions don't work in 2.6

This fixes a small case of a leftover
dict comprehension being found that stops cloud-init
from working on centos6/rhel6 (which still use py2.6)

1249. By Joshua Harlow on 2016-07-13

Fixes missing/unpacked rpm files

There are a few new files that are missing from being
included in the rpm specification file (which if missing
causes rpmbuild to die) so make sure we add them in.

1250. By Joshua Harlow on 2016-07-13

Remove another stray dict comprehension

1251. By Joshua Harlow on 2016-07-13

Another stray occurence of a dict comprehension being removed

1252. By Joshua Harlow on 2016-07-13

String format requires positions on python 2.6

1253. By Joshua Harlow on 2016-07-13

Fix SmartOS datasource usage of dict comprehensions

1254. By Scott Moser on 2016-07-14

Fix mcollective module with python3

fixes mcollective when used with python3 and also adds a unit test.

1255. By Scott Moser on 2016-07-14

ConfigDrive: fix writing of 'injected' files and legacy networking

Previous commit inadvertently disabled the consumption of 'injected' files
in configdrive (openstack server boot --file=/target/file=local-file)
unless the datasource was in 'pass' mode. The default mode is 'net' so
that was not likely to happen.

Also here are:
a.) some comments to apply_network_config

b.) add backwards compatibility for distros that do not yet implement
    apply_network_config by converting the network config into ENI format
    and calling apply_network.

    This is required because prior to the previous commit, those distros
    would have had 'apply_network' called with the openstack provided
    ENI file. But after this change they will have apply_network_config
    called by cloudinit's main.

c.) add network_state_to_eni for converting net config to eni
    it supports the not-actually-correct 'hwaddress' field in ENI

1256. By Scott Moser on 2016-07-14

improvements to eni rendering

Some improvements here, and some bug fixes.
 - bring curtin revno 394's to support post-up for interface aliases.
 - sort attributes per interface for nicer order and consistent rendering
 - use arrays for each 'section' rather than content += . This allows
   better separation of the sections and also will perform better as long
   strings with += are slow.
 - improve how 'lo' is handled. If a network state that was being rendered
   had an entry for 'lo', then the rendered ENI would have 2 'lo'
   sections.
 - no longer skip 'lo' sections when loading an ENI in parse_deb_config
 - fix inet value for subnets, don't add interface attributes to alias
   (LP: #1588547)

Also add some tests of reading yaml and rendering ENI.

1257. By Joshua Harlow on 2016-07-19

Avoid depending on argparse in 2.7 or greater

At least (currently) for rhel7 the argparse package does
not get installed (even though rpm say it is installed by
the python core package) and this causes things that mention
argparse in there requirements to not believe that argparse
is installed (even though it is) so to avoid this whole mess
we can just avoid depending on argparse in python versions
where we don't need to (since it was included in the stdlib
in python 2.7+)

1258. By Scott Moser on 2016-07-19

mcollective: add tests, cleanups and bug fix when no config in /etc.

Things here:
 - restart rather than 'start' the service, to pick up a config change
   that we would have written.
 - update the config and write cert files whether or not the file
   existed on the system. Previously it would only write the cert
   files if /etc/mcollective/server.cfg already existed.
 - improve test coverage

1259. By Scott Moser on 2016-08-10

README: indicate move to git.

cloud-init development has moved its revision control to git.
It is available at
  https://code.launchpad.net/cloud-init

Clone with
  git clone https://git.launchpad.net/cloud-init
or
  git clone git+ssh://git.launchpad.net/cloud-ini

For more information see
  https://git.launchpad.net/cloud-init/tree/HACKING.rst

[Chad Smith (chad.smith)]

Hello,

Thank you for taking the time to contribute to cloud-init Cloud-init has moved its revision control system to git. As a result, we are marking all bzr merge proposals as 'rejected'. If you would like to re-submit this proposal for review, please do so by following the current HACKING documentation at http://cloudinit.readthedocs.io/en/latest/topics/hacking.html.

Thanks again,
The Cloud init folks

review: Needs Fixing

[Scott Moser (smoser)]

I'm not sure what exactly this merge proposal was for (it seems backwards).
I've marked it 'merged', to get it off of lists.
if you were using it for something ,please feel free to set it to another state.

but remember that cloud-init is now done in git.
Thanks.

=== removed file '.bzrignore'
--- .bzrignore	2015-01-21 20:35:56 +0000
+++ .bzrignore	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-.tox
-dist
-cloud_init.egg-info
-__pycache__

=== removed file 'ChangeLog'
--- ChangeLog	2016-05-26 13:02:17 +0000
+++ ChangeLog	1970-01-01 00:00:00 +0000
@@ -1,761 +0,0 @@
-0.7.7:
- - open 0.7.7
- - Digital Ocean: add datasource for Digital Ocean. [Neal Shrader]
- - expose uses_systemd as a distro function (fix rhel7)
- - fix broken 'output' config (LP: #1387340)
- - begin adding cloud config module docs to config modules (LP: #1383510)
- - retain trailing eol from template files (sources.list) when
-   rendered with jinja (LP: #1355343)
- - Only use datafiles and initsys addon outside virtualenvs
- - Fix the digital ocean test case on python 2.6
- - Increase the usefulness, robustness, configurability of the chef module
-   so that it is more useful, more documented and better for users
- - Fix how '=' signs are not handled that well in ssh_utils (LP: #1391303)
- - Be more tolerant of ssh keys passed into 'ssh_authorized_keys'; allowing
-   for list, tuple, set, dict, string types and warning on other unexpected
-   types
- - Update to use newer/better OMNIBUS_URL for chef module
- - GCE: Allow base64 encoded user-data (LP: #1404311) [Wayne Witzell III]
- - GCE: use short hostname rather than fqdn (LP: #1383794) [Ben Howard]
- - systemd: make init stage run before login prompts shown [Steve Langasek]
- - hostname: on first boot apply hostname to be same as is written for
-   persistent hostname.  (LP: #1246485)
- - remove usage of dmidecode on linux in favor of /sys interface [Ben Howard]
- - python3 support [Barry Warsaw, Daniel Watkins, Josh Harlow] (LP: #1247132)
- - support managing gpt partitions in disk config [Daniel Watkins]
- - Azure: utilze gpt support for ephemeral formating [Daniel Watkins]
- - CloudStack: support fetching password from virtual router [Daniel Watkins]
-   (LP: #1422388)
- - readurl, read_file_or_url returns bytes, user must convert as necessary
- - SmartOS: use v2 metadata service (LP: #1436417) [Daniel Watkins]
- - NoCloud: fix local datasource claiming found without explicit dsmode
- - Snappy: add support for installing snappy packages and configuring.
- - systemd: use network-online instead of network.target (LP: #1440180)
-   [Steve Langasek]
- - Add functionality to fixate the uid of a newly added user.
- - Don't overwrite the hostname if the user has changed it after we set it.
- - GCE datasource does not handle instance ssh keys (LP: 1403617)
- - sysvinit: make cloud-init-local run before network (LP: #1275098)
-   [Surojit Pathak]
- - Azure: do not re-set hostname if user has changed it (LP: #1375252)
- - Fix exception when running with no arguments on Python 3. [Daniel Watkins]
- - Centos: detect/expect use of systemd on centos 7. [Brian Rak]
- - Azure: remove dependency on walinux-agent [Daniel Watkins]
- - EC2: know about eu-central-1 availability-zone (LP: #1456684)
- - Azure: remove password from on-disk ovf-env.xml (LP: #1443311) [Ben Howard]
- - Doc: include information on user-data in OpenStack [Daniel Watkins]
- - Systemd: check for systemd using sd_booted symantics (LP: #1461201)
-   [Lars Kellogg-Stedman]
- - Add an rh_subscription module to handle registration of Red Hat instances.
-   [Brent Baude]
- - cc_apt_configure: fix importing keys under python3 (LP: #1463373)
- - cc_growpart: fix specification of 'devices' list (LP: #1465436)
- - CloudStack: fix password setting on cloudstack > 4.5.1 (LP: #1464253)
- - GCE: fix determination of availability zone (LP: #1470880)
- - ssh: generate ed25519 host keys (LP: #1461242)
- - distro mirrors: provide datasource to mirror selection code to support
-   GCE regional mirrors. (LP: #1470890)
- - add udev rules that identify ephemeral device on Azure (LP: #1411582)
- - _read_dmi_syspath: fix bad log message causing unintended exception
- - rsyslog: add additional configuration mode (LP: #1478103)
- - status_wrapper in main: fix use of print_exc when handling exception
- - reporting: add reporting module for web hook or logging of events.
- - NoCloud: fix consumption of vendordata (LP: #1493453)
- - power_state_change: support 'condition' to disable or enable poweroff
- - ubuntu fan: support for config and installing of ubuntu fan (LP: #1504604)
- - Azure: support extracting SSH key values from ovf-env.xml (LP: #1506244)
- - AltCloud: fix call to udevadm settle (LP: #1507526)
- - Ubuntu templates: modify sources.list template to provide same sources
-   as install from server or desktop ISO. (LP: #1177432)
- - cc_mounts: use 'nofail' if system uses systemd. (LP: #1514485)
- - Azure: get instance id from dmi instead of SharedConfig (LP: #1506187)
- - systemd/power_state: fix power_state to work even if cloud-final
-   exited non-zero (LP: #1449318)
- - SmartOS: Add support for Joyent LX-Brand Zones (LP: #1540965)
-   [Robert C Jennings]
- - systemd: support using systemd-detect-virt to detect container
-   (LP: #1539016) [Martin Pitt]
- - docs: fix lock_passwd documentation [Robert C Jennings]
- - Azure: Handle escaped quotes in WALinuxAgentShim.find_endpoint.
-   (LP: #1488891) [Dan Watkins]
- - lxd: add support for setting up lxd using 'lxd init' (LP: #1522879)
- - Add Image Customization Parser for VMware vSphere Hypervisor
-   Support. [Sankar Tanguturi]
- - timezone: use a symlink rather than copy for /etc/localtime
-   unless it is already a file (LP: #1543025).
- - Enable password changing via a hashed string [Alex Sirbu]
- - Added BigStep datasource [Alex Sirbu]
- - No longer run pollinate in seed_random (LP: #1554152)
- - groups: add defalt user to 'lxd' group.  Create groups listed
-   for a user if they do not exist. (LP: #1539317)
- - dmi data: fix failure of reading dmi data for unset dmi values
- - doc: mention label for nocloud datasource must be 'cidata' [Peter Hurley]
- - ssh_pwauth: fix module to support 'unchanged' and match behavior
-   described in documentation [Chris Cosby]
- - quickly check to see if the previous instance id is still valid to
-   avoid dependency on network metadata service on every boot (LP: #1553815)
- - support network configuration in cloud-init --local with support
-   device naming via systemd.link.
- - FreeBSD: add support for installing packages, setting password and
-   timezone.  Change default user to 'freebsd'. [Ben Arblaster]
- - locale: list unsupported environment settings in warning (LP: #1558069)
- - disk_setup: correctly send --force to mkfs on block devices (LP: #1548772)
- - chef: fix chef install from gems (LP: #1553345)
- - systemd: do not specify After of obsolete syslog.target (LP: #1536964)
- - centos: Ensure that resolve conf object is written as a str (LP: #1479988)
- - chef: straighten out validation_cert and validation_key (LP: #1568940)
- - phone_home: allow usage of fqdn (LP: #1566824) [Ollie Armstrong]
- - cloudstack: Only use DHCPv4 lease files as a datasource (LP: #1576273)
-   [Wido den Hollander]
- - Paths: fix instance path if datasource's id has a '/'. (LP: #1575938)
-   [Robert Jennings]
- - Ec2: do not retry requests for user-data path on 404.
- - settings on the kernel command line (cc:) override all local settings
-   rather than only those in /etc/cloud/cloud.cfg (LP: #1582323)
-
-0.7.6:
- - open 0.7.6
- - Enable vendordata on CloudSigma datasource (LP: #1303986)
- - Poll on /dev/ttyS1 in CloudSigma datasource only if dmidecode says
-   we're running on cloudsigma (LP: #1316475) [Kiril Vladimiroff]
- - SmartOS test: do not require existance of /dev/ttyS1. [LP: #1316597]
- - doc: fix user-groups doc to reference plural ssh-authorized-keys
-   (LP: #1327065) [Joern Heissler]
- - fix 'make test' in python 2.6
- - support jinja2 as a templating engine.  Drop the hard requirement on
-   cheetah.  This helps in python3 effort. (LP: #1219223)
- - change install path for systemd files to /lib/systemd/system
-   [Dimitri John Ledkov]
- - change trunk debian packaging to use pybuild and drop cdbs.
-   [Dimitri John Ledkov]
- - SeLinuxGuard: remove invalid check that looked for stat.st_mode in os.lstat.
- - do not write comments in /etc/timezone (LP: #1341710)
- - ubuntu: provide 'ubuntu-init-switch' module to aid in systemd testing.
- - status/result json: remove 'end' entry which was always null
- - systemd: make cloud-init block ssh service startup to guarantee keys
-   are generated. [Jordan Evans] (LP: #1333920)
- - default settings: fix typo resulting in OpenStack and GCE not working
-   unless config explicitly provided (LP: #1329583) [Garrett Holmstrom])
- - fix rendering resolv.conf if no 'options' are provided (LP: #1328953)
- - docs: fix disk-setup to reference 'table_type' [Rail Aliiev] (LP: #1313114)
- - ssh_authkey_fingerprints: fix bug that prevented disabling the module.
-   (LP: #1340903) [Patrick Lucas]
- - no longer use pylint as a checker, fix pep8 [Jay Faulkner].
- - Openstack: do not load some urls twice.
- - FreeBsd: fix initscripts and add working config file [Harm Weites]
- - Datasource: fix broken logic to provide hostname if datasource does not
-   provide one
- - Improved and less verbose logging.
- - resizefs: first check that device is writable.
- - configdrive: fix reading of vendor data to be like metadata service reader.
-   [Jay Faulkner]
- - resizefs: fix broken background resizing [Jay Faulkner] (LP: #1338614)
- - cc_grub_dpkg: fix EC2 hvm instances to avoid prompt on grub update.
-   (LP: #1336855)
- - FreeBsd: support config drive datasource [Joseph bajin]
- - cc_mounts: support creating a swap file
- - DigitalOcean & GCE: fix get_hostname consistency
-0.7.5:
- - open 0.7.5
- - Add a debug log message around import failures
- - add a 'debug' module for easily printing out some information about
-   datasource and cloud-init [Shraddha Pandhe]
- - support running apt with 'eatmydata' via configuration token
-   apt_get_wrapper (LP: #1236531).
- - convert paths provided in config-drive 'files' to string before writing
-   (LP: #1260072).
- - Azure: minor changes in logging output. ensure filenames are strings (not
-   unicode).
- - config/cloud.cfg.d/05_logging.cfg: provide a default 'output' setting, to
-   redirect cloud-init stderr and stdout /var/log/cloud-init-output.log.
- - drop support for resizing partitions with parted entirely (LP: #1212492).
-   This was broken as it was anyway.
- - add support for vendordata in SmartOS and NoCloud datasources.
- - drop dependency on boto for crawling ec2 metadata service.
- - add 'Requires' on sudo (for OpenNebula datasource) in rpm specs, and
-   'Recommends' in the debian/control.in [Vlastimil Holer]
- - if mount_info reports /dev/root is a device path for /, then convert
-   that to a device via help of kernel cmdline.
- - configdrive: consider partitions as possible datasources if they have
-   theh correct filesystem label. [Paul Querna]
- - initial freebsd support [Harm Weites]
- - fix in is_ipv4 to accept IP addresses with a '0' in them.
- - Azure: fix issue when stale data in /var/lib/waagent (LP: #1269626)
- - skip config_modules that declare themselves only verified on a set of
-   distros.  Add them to 'unverified_modules' list to run anyway.
- - Add CloudSigma datasource [Kiril Vladimiroff]
- - Add initial support for Gentoo and Arch distributions [Nate House]
- - Add GCE datasource [Vaidas Jablonskis]
- - Add native Openstack datasource which reads openstack metadata
-   rather than relying on EC2 data in openstack metadata service.
- - SmartOS, AltCloud: disable running on arm systems due to bug
-   (LP: #1243287, #1285686) [Oleg Strikov]
- - Allow running a command to seed random, default is 'pollinate -q'
-   (LP: #1286316) [Dustin Kirkland]
- - Write status to /run/cloud-init/status.json for consumption by
-   other programs (LP: #1284439)
- - Azure: if a reboot causes ephemeral storage to be re-provisioned
-   Then we need to re-format it. (LP: #1292648)
- - OpenNebula: support base64 encoded user-data
-   [Enol Fernandez, Peter Kotcauer]
-0.7.4:
- - fix issue mounting 'ephemeral0' if ephemeral0 was an alias for a
-   partitioned block device with target filesystem on ephemeral0.1.
-   (LP: #1236594)
- - fix DataSourceAzure incompatibility with 2.6 (LP: #1232175)
- - fix power_state_change config module so that example works.  Improve
-   its documentation and add reference to 'timeout'
- - support apt-add-archive with 'cloud-archive:' format.  (LP: #1244355)
- - Change SmartOS verb for availability zone (LP: #1249124)
- - documentation fix for boothooks to use 'cloud-init-per'
- - fix resizefs module by supporting kernels that do not have
-   /proc/PID/mountinfo.  (LP: #1248625) [Tim Daly Jr.]
- - fix 'make rpm' by removing 0.6.4 entry from ChangeLog (LP: #1241834)
-0.7.3:
- - fix omnibus chef installer (LP: #1182265) [Chris Wing]
- - small fix for OVF datasource for iso transport on non-iso9660 filesystem
- - determine if upstart version is suitable for
-   'initctl reload-configuration' (LP: #1124384).  If so, then invoke it.
-   supports setting up instance-store disk with partition table and filesystem.
- - add Azure datasource.
- - add support for SuSE / SLES [Juerg Haefliger]
- - add a trailing carriage return to chpasswd input, which reportedly
-   caused a problem on rhel5 if missing.
- - support individual MIME segments to be gzip compressed (LP: #1203203)
- - always finalize handlers even if processing failed (LP: #1203368)
- - support merging into cloud-config via jsonp. (LP: #1200476)
- - add datasource 'SmartOS' for Joyent Cloud.  Adds a dependency on serial.
- - add 'log_time' helper to util for timing how long things take
-   which also reads from uptime. uptime is useful as clock may change during
-   boot due to ntp.
- - prefer growpart resizer to 'parted resizepart' (LP: #1212492)
- - support random data seed from config drive or azure, and a module
-   'seed_random' to read that and write it to /dev/urandom.
- - add OpenNebula Datasource [Vlastimil Holer]
- - add 'cc_disk_setup' config module for paritioning disks and creating
-   filesystems.  Useful if attached disks are not formatted (LP: #1218506)
- - Fix usage of libselinux-python when selinux is disabled. [Garrett Holmstrom]
- - multi_log: only write to /dev/console if it exists [Garrett Holmstrom]
- - config/cloud.cfg: add 'sudo' to list groups for the default user 
-   (LP: #1228228)
- - documentation fix for use of 'mkpasswd' [Eric Nordlund]
- - respect /etc/growroot-disabled file (LP: #1234331)
-0.7.2:
- - add a debian watch file
- - add 'sudo' entry to ubuntu's default user (LP: #1080717)
- - fix resizefs module when 'noblock' was provided (LP: #1080985)
- - make sure there is no blank line before cloud-init entry in
-   there are no blank lines in /etc/ca-certificates.conf (LP: #1077020)
- - fix sudoers writing when entry is a string (LP: #1079002)
- - tools/write-ssh-key-fingerprints: use '-s' rather than '--stderr'
-   option (LP: #1083715)
- - make install of puppet configurable (LP: #1090205) [Craig Tracey]
- - support omnibus installer for chef [Anatoliy Dobrosynets]
- - fix bug where cloud-config in user-data could not modify system_info
-   settings (LP: #1090482)
- - fix CloudStack DataSource to use Virtual Router as described by
-   CloudStack documentation if it is available by searching through dhclient
-   lease files.  If it is not available, then fall back to the default
-   gateway. (LP: #1089989)
- - fix redaction of password field in log (LP: #1096417)
- - fix to cloud-config user setup.  Previously, lock_passwd was broken and
-   all accounts would be locked unless 'system' was given (LP: #1096423).
- - Allow 'sr0' (or sr[0-9]) to be specified without /dev/ as a source for
-   mounts. [Vlastimil Holer]
- - allow config-drive-data to come from a CD device by more correctly
-   filtering out partitions.  (LP: #1100545)
- - setup docs to be available on read-the-docs
-   https://cloudinit.readthedocs.org/en/latest/ (LP: #1093039)
- - add HACKING file for information on contributing
- - handle the legacy 'user:' configuration better, making it affect the
-   configured OS default user (LP: #1100920)
- - Adding a resolv.conf configuration module (LP: #1100434).  Currently only
-   working on redhat systems (no support for resolvconf)
- - support grouping linux distros into "os_families".  This allows a module
-   to operate on the family (redhat or debian) rather than the distro (ubuntu,
-   debian, fedora, rhel) (LP: #1100029)
- - fix /etc/hosts writing when templates are used (LP: #1100036)
- - add package versioning logic to package installation
-   functionality (LP: #1108047)
- - fix documentation for write_files to correctly list 'permissions'
-   rather than 'perms' (LP: #1111205)
- - cloud-init-container.conf: ensure /run/network before running ifquery
- - DataSourceNoCloud: allow user-data and meta-data to be specified
-   in config (LP: #1115833).
- - improve debian support in sysvinit scripts, package build scripts, and
-   split sources.list template to be distro specific.
- - support for resizing btrfs root filesystems [Blair Zajac]
- - fix issue when writing ssh keys to .ssh/authorized_keys (LP: #1136343)
- - upstart: cloud-init-nonet.conf trap the TERM signal, so that dmesg or other
-   output does not get a 'killed by TERM signal' message.
- - support resizing partitions via growpart or parted (LP: #1136936)
- - allow specifying apt-get command in distro config ('apt_get_command')
- - support different and user-suppliable merging algorithms for cloud-config
-   (LP: #1023179)
- - use python-requests rather than urllib2.  By using recent versions of
-   python-requests, we get https support (LP: #1067888).
- - make apt-get invoke 'dist-upgrade' rather than 'upgrade' for
-   package_upgrade. (LP: #1164147)
- - improvements for systemd with Fedora 18
- - workaround 2.6 kernel issue that stopped blkid from showing /dev/sr0
- - add new, backwards compatible merging syntax so merging of cloud-config
-   can be more useful.
-
-0.7.1:
- - sysvinit: fix missing dependency in cloud-init job for RHEL 5.6 
- - config-drive: map hostname to local-hostname (LP: #1061964)
- - landscape: install landscape-client package if not installed.
-   only take action if cloud-config is present (LP: #1066115)
- - cc_landscape: restart landscape after install or config (LP: #1070345)
- - multipart/archive.  do not fail on unknown headers in multipart
-   mime or cloud-archive config (LP: #1065116).
- - tools/Z99-cloud-locale-test.sh: avoid warning when user's shell is
-   zsh (LP: #1073077)
- - fix stack trace when unknown user-data input had unicode (LP: #1075756)
- - split 'apt-update-upgrade' config module into 'apt-configure' and
-   'package-update-upgrade-install'.  The 'package-update-upgrade-install'
-   will be a cross distro module.
- - Cleanups:
-   - Remove usage of paths.join, as all code should run through util helpers
-   - Fix pylint complaining about tests folder 'helpers.py' not being found
-   - Add a pylintrc file that is used instead options hidden in 'run_pylint'
- - fix bug where cloud-config from user-data could not affect system_info
-   settings [revno 703] (LP: #1076811)
- - for write fqdn to system config for rh/fedora [revno 704]
- - add yaml/cloud config examples checking tool [revno 706]
- - Fix the merging of group configuration when that group configuration is a
-   dict => members. [revno 707]
- - add yum_add_repo configuration module for adding additional yum repos
- - fix public key importing with config-drive-v2 datasource (LP: #1077700)
- - handle renaming and fixing up of marker names (LP: 1075980) [revno 710]
-   this relieves that burden from the distro/packaging.
- - group config: fix how group members weren't being translated correctly
-   when the group: [member, member...] format was used (LP: #1077245)
- - sysconfig: fix how the /etc/sysconfig/network should be using the fully
-   qualified domain name instead of the partially qualified domain name
-   which is used in the ubuntu/debian case (LP: #1076759)
- - fix how string escaping was not working when the string was a unicode
-   string which was causing the warning message not to be written
-   out (LP: #1075756)
- - for boto > 0.6.0 there was a lazy load of the metadata added, when
-   cloud-init runs the usage of this lazy loading is hidden and since that lazy
-   loading will be performed on future attribute access we must traverse the
-   lazy loaded dictionary and force it to full expand so that if cloud-init
-   blocks the ec2 metadata port the lazy loaded dictionary will continue
-   working properly instead of trying to make additional url calls which will
-   fail (LP: #1068801)
- - use a set of helper/parsing classes to perform system configuration
-   for easier test.  (/etc/sysconfig, /etc/hostname, resolv.conf, /etc/hosts)
- - add power_state_change config module for shutting down stystem after
-   cloud-init finishes. (LP: #1064665)
-0.7.0:
- - add a 'exception_cb' argument to 'wait_for_url'.  If provided, this
-   method will be called back with the exception received and the message.
- - utilize the 'exception_cb' above to modify the oauth timestamp in 
-   DataSourceMAAS requests if a 401 or 403 is received. (LP: #978127)
- - catch signals and exit rather than stack tracing
- - if logging fails, enable a fallback logger by patching the logging module
- - do not 'start networking' in cloud-init-nonet, but add
-   cloud-init-container job that runs only if in container and emits
-   net-device-added (LP: #1031065)
- - search only top level dns for 'instance-data' in 
-   DataSourceEc2 (LP: #1040200)
- - add support for config-drive-v2 (LP:#1037567)
- - support creating users, including the default user.
-   [Ben Howard] (LP: #1028503)
- - add apt_reboot_if_required to reboot if an upgrade or package installation
-   forced the need for one (LP: #1038108)
- - allow distro mirror selection to include availability-zone (LP: #1037727)
- - allow arch specific mirror selection (select ports.ubuntu.com on arm)
-   LP: #1028501
- - allow specification of security mirrors (LP: #1006963)
- - add the 'None' datasource (LP: #906669), which will allow jobs
-   to run even if there is no "real" datasource found.
- - write ssh authorized keys to console, ssh_authkey_fingerprints
-   config module [Joshua Harlow] (LP: #1010582)
- - Added RHEVm and vSphere support as source AltCloud [Joseph VLcek]
- - add write-files module (LP: #1012854)
- - Add setuptools + cheetah to debian package build dependencies (LP: #1022101)
- - Adjust the sysvinit local script to provide 'cloud-init-local' and have
-   the cloud-config script depend on that as well.
- - Add the 'bzr' name to all packages built
- - Reduce logging levels for certain non-critical cases to DEBUG instead of the
-   previous level of WARNING
- - unified binary that activates the various stages
-   - Now using argparse + subcommands to specify the various CLI options
- - a stage module that clearly separates the stages of the different
-   components (also described how they are used and in what order in the
-   new unified binary)
- - user_data is now a module that just does user data processing while the
-   actual activation and 'handling' of the processed user data is done via
-   a separate set of files (and modules) with the main 'init' stage being the
-   controller of this
-   - creation of boot_hook, cloud_config, shell_script, upstart_job version 2
-     modules (with classes that perform there functionality) instead of those
-     having functionality that is attached to the cloudinit object (which
-     reduces reuse and limits future functionality, and makes testing harder)
- - removal of global config that defined paths, shared config, now this is
-   via objects making unit testing testing and global side-effects a non issue
- - creation of a 'helpers.py' 
-   - this contains an abstraction for the 'lock' like objects that the various 
-     module/handler running stages use to avoid re-running a given 
-     module/handler for a given frequency. this makes it separated from 
-     the actual usage of that object (thus helpful for testing and clear lines
-     usage and how the actual job is accomplished)
-     - a common 'runner' class is the main entrypoint using these locks to
-       run function objects passed in (along with there arguments) and there
-       frequency
-   - add in a 'paths' object that provides access to the previously global
-     and/or config based paths (thus providing a single entrypoint object/type
-     that provides path information)
-       - this also adds in the ability to change the path when constructing 
-       that path 'object' and adding in additional config that can be used to 
-       alter the root paths of 'joins' (useful for testing or possibly useful
-       in chroots?)
-        - config options now avaiable that can alter the 'write_root' and the 
-         'read_root' when backing code uses the paths join() function
-   - add a config parser subclass that will automatically add unknown sections
-     and return default values (instead of throwing exceptions for these cases)
-   - a new config merging class that will be the central object that knows
-     how to do the common configuration merging from the various configuration
-     sources. The order is the following:
-     - cli config files override environment config files
-       which override instance configs which override datasource
-       configs which override base configuration which overrides
-       default configuration.
- - remove the passing around of the 'cloudinit' object as a 'cloud' variable
-   and instead pass around an 'interface' object that can be given to modules
-   and handlers as there cloud access layer while the backing of that
-   object can be varied (good for abstraction and testing)
- - use a single set of functions to do importing of modules
- - add a function in which will search for a given set of module names with
-   a given set of attributes and return those which are found
- - refactor logging so that instead of using a single top level 'log' that
-   instead each component/module can use its own logger (if desired), this
-   should be backwards compatible with handlers and config modules that used
-   the passed in logger (its still passed in)
-   - ensure that all places where exception are caught and where applicable
-     that the util logexc() is called, so that no exceptions that may occur
-     are dropped without first being logged (where it makes sense for this 
-     to happen)
- - add a 'requires' file that lists cloud-init dependencies
-   - applying it in package creation (bdeb and brpm) as well as using it
-     in the modified setup.py to ensure dependencies are installed when
-     using that method of packaging
- - add a 'version.py' that lists the active version (in code) so that code
-   inside cloud-init can report the version in messaging and other config files
- - cleanup of subprocess usage so that all subprocess calls go through the
-   subp() utility method, which now has an exception type that will provide
-   detailed information on python 2.6 and 2.7
- - forced all code loading, moving, chmod, writing files and other system
-   level actions to go through standard set of util functions, this greatly 
-   helps in debugging and determining exactly which system actions cloud-init
-   is performing
- - adjust url fetching and url trying to go through a single function that
-   reads urls in the new 'url helper' file, this helps in tracing, debugging
-   and knowing which urls are being called and/or posted to from with-in 
-   cloud-init code
-   - add in the sending of a 'User-Agent' header for all urls fetched that
-     do not provide there own header mapping, derive this user-agent from
-     the following template, 'Cloud-Init/{version}' where the version is the
-     cloud-init version number
- - using prettytable for netinfo 'debug' printing since it provides a standard
-   and defined output that should be easier to parse than a custom format
- - add a set of distro specific classes, that handle distro specific actions
-   that modules and or handler code can use as needed, this is organized into
-   a base abstract class with child classes that implement the shared 
-   functionality. config determines exactly which subclass to load, so it can
-   be easily extended as needed.
-   - current functionality
-      - network interface config file writing
-      - hostname setting/updating
-      - locale/timezone/ setting
-      - updating of /etc/hosts (with templates or generically)
-      - package commands (ie installing, removing)/mirror finding
-      - interface up/down activating
-   - implemented a debian + ubuntu subclass
-   - implemented a redhat + fedora subclass
- - adjust the root 'cloud.cfg' file to now have distrobution/path specific 
-   configuration values in it. these special configs are merged as the normal
-   config is, but the system level config is not passed into modules/handlers
-   - modules/handlers must go through the path and distro object instead
- - have the cloudstack datasource test the url before calling into boto to 
-   avoid the long wait for boto to finish retrying and finally fail when
-   the gateway meta-data address is unavailable
- - add a simple mock ec2 meta-data python based http server that can serve a
-   very simple set of ec2 meta-data back to callers
-      - useful for testing or for understanding what the ec2 meta-data 
-        service can provide in terms of data or functionality
- - for ssh key and authorized key file parsing add in classes and util
-   functions that maintain the state of individual lines, allowing for a
-   clearer separation of parsing and modification (useful for testing and
-   tracing)
- - add a set of 'base' init.d scripts that can be used on systems that do
-   not have full upstart or systemd support (or support that does not match
-   the standard fedora/ubuntu implementation)
-   - currently these are being tested on RHEL 6.2
- - separate the datasources into there own subdirectory (instead of being
-   a top-level item), this matches how config 'modules' and user-data
-   'handlers' are also in there own subdirectory (thus helping new developers
-   and others understand the code layout in a quicker manner)
- - add the building of rpms based off a new cli tool and template 'spec' file
-   that will templatize and perform the necessary commands to create a source
-   and binary package to be used with a cloud-init install on a 'rpm'
-   supporting system
-   - uses the new standard set of requires and converts those pypi requirements
-     into a local set of package requirments (that are known to exist on RHEL
-     systems but should also exist on fedora systems)
- - adjust the bdeb builder to be a python script (instead of a shell script)
-   and make its 'control' file a template that takes in the standard set of
-   pypi dependencies and uses a local mapping (known to work on ubuntu) to
-   create the packages set of dependencies (that should also work on
-   ubuntu-like systems)
- - pythonify a large set of various pieces of code
-   - remove wrapping return statements with () when it has no effect
-   - upper case all constants used
-   - correctly 'case' class and method names (where applicable)
-   - use os.path.join (and similar commands) instead of custom path creation
-   - use 'is None' instead of the frowned upon '== None' which picks up a large
-     set of 'true' cases than is typically desired (ie for objects that have
-     there own equality)
-   - use context managers on locks, tempdir, chdir, file, selinux, umask, 
-     unmounting commands so that these actions do not have to be closed and/or
-     cleaned up manually in finally blocks, which is typically not done and
-     will eventually be a bug in the future
-   - use the 'abc' module for abstract classes base where possible
-      - applied in the datasource root class, the distro root class, and the
-        user-data v2 root class
- - when loading yaml, check that the 'root' type matches a predefined set of
-   valid types (typically just 'dict') and throw a type error if a mismatch
-   occurs, this seems to be a good idea to do when loading user config files
- - when forking a long running task (ie resizing a filesytem) use a new util
-   function that will fork and then call a callback, instead of having to
-   implement all that code in a non-shared location (thus allowing it to be
-   used by others in the future)
- - when writing out filenames, go through a util function that will attempt to
-   ensure that the given filename is 'filesystem' safe by replacing '/' with
-   '_' and removing characters which do not match a given whitelist of allowed
-   filename characters
- - for the varying usages of the 'blkid' command make a function in the util
-   module that can be used as the single point of entry for interaction with
-   that command (and its results) instead of having X separate implementations
- - place the rfc 8222 time formatting and uptime repeated pieces of code in the
-   util module as a set of function with the name 'time_rfc2822'/'uptime'
- - separate the pylint+pep8 calling from one tool into two indivudal tools so
-   that they can be called independently, add make file sections that can be 
-   used to call these independently
- - remove the support for the old style config that was previously located in
-   '/etc/ec2-init/ec2-config.cfg', no longer supported!
- - instead of using a altered config parser that added its own 'dummy' section
-   on in the 'mcollective' module, use configobj which handles the parsing of
-   config without sections better (and it also maintains comments instead of
-   removing them)
- - use the new defaulting config parser (that will not raise errors on sections
-   that do not exist or return errors when values are fetched that do not
-   exist) in the 'puppet' module
- - for config 'modules' add in the ability for the module to provide a list of 
-   distro names which it is known to work with, if when ran and the distro
-   being used name does not match one of those in this list, a warning will be
-   written out saying that this module may not work correctly on this
-   distrobution
- - for all dynamically imported modules ensure that they are fixed up before 
-   they are used by ensuring that they have certain attributes, if they do not
-   have those attributes they will be set to a sensible set of defaults instead
- - adjust all 'config' modules and handlers to use the adjusted util functions
-   and the new distro objects where applicable so that those pieces of code can
-   benefit from the unified and enhanced functionality being provided in that
-   util module
- - fix a potential bug whereby when a #includeonce was encountered it would
-   enable checking of urls against a cache, if later a #include was encountered
-   it would continue checking against that cache, instead of refetching (which
-   would likely be the expected case)
- - add a openstack/nova based pep8 extension utility ('hacking.py') that allows
-   for custom checks (along with the standard pep8 checks) to occur when
-   running 'make pep8' and its derivatives
- - support relative path in AuthorizedKeysFile (LP: #970071).
- - make apt-get update run with --quiet (suitable for logging) (LP: #1012613)
- - cc_salt_minion: use package 'salt-minion' rather than 'salt' (LP: #996166)
- - use yaml.safe_load rather than yaml.load (LP: #1015818)
-0.6.3:
- - add sample systemd config files [Garrett Holmstrom]
- - add Fedora support [Garrent Holstrom] (LP: #883286)
- - fix bug in netinfo.debug_info if no net devices available (LP: #883367)
- - use python module hashlib rather than md5 to avoid deprecation warnings.
- - support configuration of mirror based on dns name ubuntu-mirror in
-   local domain.
- - support setting of Acquire::HTTP::Proxy via 'apt_proxy'
- - DataSourceEc2: more resilliant to slow metadata service
-   - config change: 'retries' dropped, 'max_wait' added, timeout increased
- - close stdin in all cloud-init programs that are launched at boot 
-   (LP: #903993)
- - revert management of /etc/hosts to 0.6.1 style (LP: #890501, LP: #871966)
- - write full ssh keys to console for easy machine consumption (LP: #893400)
- - put INSTANCE_ID environment variable in bootcmd scripts
- - add 'cloud-init-per' script for easily running things with a given frequency
- - replace cloud-init-run-module with cloud-init-per
- - support configuration of landscape-client via cloud-config (LP: #857366)
- - part-handlers now get base64 decoded content rather than 2xbase64 encoded
-   in the payload parameter. (LP: #874342)
- - add test case framework [Mike Milner] (LP: #890851)
- - fix pylint warnings [Juerg Haefliger] (LP: #914739)
- - add support for adding and deleting CA Certificates [Mike Milner] 
-   (LP: #915232)
- - in ci-info lines, use '.' to indicate empty field for easier machine reading
- - support empty lines in "#include" files (LP: #923043)
- - support configuration of salt minions (Jeff Bauer) (LP: #927795)
- - DataSourceOVF: only search for OVF data on ISO9660 filesystems (LP: #898373)
- - DataSourceConfigDrive: support getting data from openstack config drive
-   (LP: #857378)
- - DataSourceNoCloud: support seed from external disk of ISO or vfat
-   (LP: #857378)
- - DataSourceNoCloud: support inserting /etc/network/interfaces
- - DataSourceMaaS: add data source for Ubuntu Machines as a Service (MaaS)
-   (LP: #942061)
- - DataSourceCloudStack: add support for CloudStack datasource [Cosmin Luta]
- - add option 'apt_pipelining' to address issue with S3 mirrors 
-   (LP: #948461) [Ben Howard]
- - warn on non-multipart, non-handled user-data [Martin Packman]
- - run resizefs in the background in order to not block boot (LP: #961226)
- - Fix bug in Chef support where validation_key was present in config, but
-   'validation_cert' was not (LP: #960547)
- - Provide user friendly message when an invalid locale is set 
-   [Ben Howard] (LP: #859814)
- - Support reading cloud-config from kernel command line parameter and
-   populating local file with it, which can then provide data for DataSources
- - improve chef examples for working configurations on 11.10 and 12.04 
-   [Lorin Hochstein] (LP: #960564)
-
-0.6.2:
- - fix bug where update was not done unless update was explicitly set.
-   It would not be run if 'upgrade' or packages were set to be installed
- - fix bug in part-handler code, that prevented working part-handlers
-   (LP: #739694)
- - fix bug in resizefs cloud-config that would cause trace based on
-   failure of 'blkid /dev/root' (LP: #726938)
- - convert dos formated files to unix for user-scripts, boothooks,
-   and upstart jobs (LP: #744965)
- - fix bug in seeding of grub dpkg configuration (LP: #752361) due
-   to renamed devices in newer (natty) kernels (/dev/sda1 -> /dev/xvda1)
- - make metadata urls configurable, to support eucalyptus in
-   STATIC or SYSTEM modes (LP: #761847)
- - support disabling byobu in cloud-config
- - run cc_ssh as a cloud-init module so it is guaranteed to run before
-   ssh starts (LP: #781101)
- - make prefix for keys added to /root/.ssh/authorized_keys configurable
-   and add 'no-port-forwarding,no-agent-forwarding,no-X11-forwarding'
-   to the default (LP: #798505)
- - make 'cloud-config ready' command configurable (LP: #785551)
- - make fstab fields used to 'fill in' shorthand entries configurable
-   This means you do not have to have 'nobootwait' in the values
-   (LP: #785542)
- - read /etc/ssh/sshd_config for AuthorizedKeysFile rather than
-   assuming ~/.ssh/authorized_keys (LP: #731849)
- - fix cloud-init in ubuntu lxc containers (LP: #800824)
- - sanitize hosts file for system's hostname to 127.0.1.1 (LP: #802637)
- - add chef support (cloudinit/CloudConfig/cc_chef.py) (LP: ##798844)
- - do not give trace on failure to resize in lxc container (LP: #800856)
- - increase the timeout on url gets for "seedfrom" values (LP: #812646)
- - do not write entries for ephemeral0 on t1.micro (LP: #744019)
- - support 'include-once' so that expiring or one-time use urls can
-   be used for '#include' to provide sensitive data.
- - support for passing public and private keys to mcollective via cloud-config
- - support multiple staticly configured network devices, as long as
-   all of them come up early (LP: #810044)
- - Changes to handling user data mean that:
-   * boothooks will now run more than once as they were intended (and as
-     bootcmd commands do)
-   * cloud-config and user-scripts will be updated from user data every boot
- - Fix issue where 'isatty' would return true for apt-add-repository.
-   apt-add-repository would get stdin which was attached to a terminal
-   (/dev/console) and would thus hang when running during boot.  (LP: 831505)
-   This was done by changing all users of util.subp to have None input unless
-   specified
- - Add some debug info to the console when cloud-init runs.
-   This is useful if debugging, IP and route information is printed to the 
-   console.
- - change the mechanism for handling .ssh/authorized_keys, to update entries
-   rather than appending.  This ensures that the authorized_keys that are
-   being inserted actually do something (LP: #434076, LP: #833499)
- - log warning on failure to set hostname (LP: #832175)
- - upstart/cloud-init-nonet.conf: wait for all network interfaces to be up
-   allow for the possibility of /var/run != /run.
- - DataSourceNoCloud, DataSourceOVF : do not provide a default hostname.
-   This way the configured hostname of the system will be used if not provided
-   by metadata (LP: #838280)
- - DataSourceOVF: change the default instance id to 'iid-dsovf' from 'nocloud'
- - Improve the OVF documentation, and provide a simple command line
-   tool for creating a useful ISO file.
-
-0.6.1:
- - fix bug in fixing permission on /var/log/cloud-init.log (LP: #704509)
- - improve comment strings in rsyslog file tools/21-cloudinit.conf
- - add previous-instance-id and previous-datasource files to datadir
- - add 'datasource' file to instance dir
- - add setting of passwords and enabling/disabling of PasswordAuthentication
-   for sshd.  By default no changes are done to sshd.
- - fix for puppet configuration options (LP: #709946) [Ryan Lane]
- - fix pickling of DataSource, which broke seeding.
- - turn resize_rootfs default to True
- - avoid mounts in DataSourceOVF if 'read' on device fails
-   'mount /dev/sr0' for an empty virtual cdrom device was taking 18 seconds
- - add 'manual_cache_clean' option to select manual cleaning of
-   the /var/lib/cloud/instance/ link, for a data source that might
-   not be present on every boot
- - make DataSourceEc2 retries and timeout configurable
- - add helper routines for apt-get update and install
- - add 'bootcmd' like 'runcmd' to cloud-config syntax for running things early
- - move from '#opt_include' in config file format to conf_d.
-   ie, now files in /etc/cloud.cfg.d/ is read rather than reading
-   '#opt_include <filename>' or '#include <filename>' in cloud.cfg
- - allow /etc/hosts to be written from hosts.tmpl. which allows
-   getting local-hostname into /etc/hosts (LP: #720440)
- - better handle startup if there is no eth0 (LP: #714807)
- - update rather than append in puppet config [Marc Cluet]
- - add cloud-config for mcollective [Marc Cluet]
-0.6.0:
- - change permissions of /var/log/cloud-init.log to accomodate
-   syslog writing to it (LP: #704509)
- - rework of /var/lib/cloud layout
- - remove updates-check (LP: #653220)
- - support resizing / on first boot (enabled by default)
- - added support for running CloudConfig modules at cloud-init time
-   rather than cloud-config time, and the new 'cloud_init_modules'
-   entry in cloud.cfg to indicate which should run then.
-   The driving force behind this was to have the rsyslog module
-   able to run before rsyslog even runs so that a restart would
-   not be needed (rsyslog on ubuntu runs on 'filesystem')
- - moved setting and updating of hostname to cloud_init_modules
-   this allows the user to easily disable these from running.
-   This also means:
-   - the semaphore name for 'set_hostname' and 'update_hostname'
-     changes to 'config_set_hostname' and 'config_update_hostname'
- - added cloud-config option 'hostname' for setting hostname
- - moved upstart/cloud-run-user-script.conf to upstart/cloud-final.conf
- - cloud-final.conf now runs runs cloud-config modules similar
-   to cloud-config and cloud-init.
- - LP: #653271 
-   - added writing of "boot-finished" to /var/lib/cloud/instance/boot-finished
-     this is the last thing done, indicating cloud-init is finished booting
-   - writes message to console with timestamp and uptime
- - write ssh keys to console as one of the last things done
-   this is to ensure they don't get run off the 'get-console-ouptut' buffer
- - user_scripts run via cloud-final and thus semaphore renamed from
-   user_scripts to config_user_scripts
- - add support for redirecting output of cloud-init, cloud-config, cloud-final
-   via the config file, or user data config file
- - add support for posting data about the instance to a url (phone_home)
- - add minimal OVF transport (iso) support
- - make DataSources that are attempted dynamic and configurable from
-   system config. changen "cloud_type: auto" as configuration for this
-   to 'datasource_list: [ "Ec2" ]'.  Each of the items in that list
-   must be modules that can be loaded by "DataSource<item>"
- - add 'timezone' option to cloud-config (LP: #645458)
- - Added an additional archive format, that can be used for multi-part
-   input to cloud-init.  This may be more user friendly then mime-multipart
-   See example in doc/examples/cloud-config-archive.txt (LP: #641504)
- - add support for reading Rightscale style user data (LP: #668400)
-   and acting on it in cloud-config (cc_rightscale_userdata.py)
- - make the message on 'disable_root' more clear (LP: #672417)
- - do not require public key if private is given in ssh cloud-config 
-   (LP: #648905)
-# vi: syntax=text textwidth=79

=== removed file 'HACKING.rst'
--- HACKING.rst	2014-08-26 18:53:44 +0000
+++ HACKING.rst	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-=====================
-Hacking on cloud-init
-=====================
-
-To get changes into cloud-init, the process to follow is:
-
-* If you have not already, be sure to sign the CCA:
-
-  - `Canonical Contributor Agreement`_
-
-* Get your changes into a local bzr branch.
-  Initialize a repo, and checkout trunk (init repo is to share bzr info across multiple checkouts, its different than git):
-
-  - ``bzr init-repo cloud-init``
-  - ``bzr branch lp:cloud-init trunk.dist``
-  - ``bzr branch trunk.dist my-topic-branch``
-
-* Commit your changes (note, you can make multiple commits, fixes, more commits.):
-
-  - ``bzr commit``
-
-* Check pep8 and test, and address any issues:
-
-  - ``make test pep8``
-
-* Push to launchpad to a personal branch:
-
-  - ``bzr push lp:~<YOUR_USERNAME>/cloud-init/<BRANCH_NAME>``
-
-* Propose that for a merge into lp:cloud-init via web browser.
-
-  - Open the branch in `Launchpad`_
-
-    - It will typically be at ``https://code.launchpad.net/<YOUR_USERNAME>/<PROJECT>/<BRANCH_NAME>``
-    - ie. https://code.launchpad.net/~smoser/cloud-init/mybranch
-
-* Click 'Propose for merging'
-* Select 'lp:cloud-init' as the target branch
-
-Then, someone on cloud-init-dev (currently `Scott Moser`_ and `Joshua Harlow`_) will 
-review your changes and follow up in the merge request.
-
-Feel free to ping and/or join #cloud-init on freenode (irc) if you have any questions.
-
-.. _Launchpad: https://launchpad.net
-.. _Canonical Contributor Agreement: http://www.canonical.com/contributors
-.. _Scott Moser: https://launchpad.net/~smoser
-.. _Joshua Harlow: https://launchpad.net/~harlowja

=== removed file 'LICENSE'
--- LICENSE	2011-09-21 19:08:17 +0000
+++ LICENSE	1970-01-01 00:00:00 +0000
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.

=== removed file 'MANIFEST.in'
--- MANIFEST.in	2015-01-21 20:14:24 +0000
+++ MANIFEST.in	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-include *.py MANIFEST.in ChangeLog
-global-include *.txt *.rst *.ini *.in *.conf *.cfg *.sh
-graft tools
-prune build
-prune dist
-prune .tox
-prune .bzr
-exclude .bzrignore

=== removed file 'Makefile'
--- Makefile	2016-03-04 06:45:58 +0000
+++ Makefile	1970-01-01 00:00:00 +0000
@@ -1,82 +0,0 @@
-CWD=$(shell pwd)
-PYVER ?= 3
-noseopts ?= -v
-
-YAML_FILES=$(shell find cloudinit bin tests tools -name "*.yaml" -type f )
-YAML_FILES+=$(shell find doc/examples -name "cloud-config*.txt" -type f )
-
-CHANGELOG_VERSION=$(shell $(CWD)/tools/read-version)
-CODE_VERSION=$(shell python -c "from cloudinit import version; print version.version_string()")
-
-PIP_INSTALL := pip install
-
-ifeq ($(PYVER),3)
-  pyflakes = pyflakes3
-  unittests = unittest3
-  yaml = yaml
-else
-ifeq ($(PYVER),2)
-  pyflakes = pyflakes
-  unittests = unittest
-else
-  pyflakes = pyflakes pyflakes3
-  unittests = unittest unittest3
-endif
-endif
-
-ifeq ($(distro),)
-  distro = redhat
-endif
-
-all: check
-
-check: check_version pep8 $(pyflakes) test $(yaml)
-
-pep8:
-	@$(CWD)/tools/run-pep8
-
-pyflakes:
-	@$(CWD)/tools/run-pyflakes
-
-pyflakes3:
-	@$(CWD)/tools/run-pyflakes3
-	
-unittest: clean_pyc
-	nosetests $(noseopts) tests/unittests
-
-unittest3: clean_pyc
-	nosetests3 $(noseopts) tests/unittests
-
-pip-requirements:
-	@echo "Installing cloud-init dependencies..."
-	$(PIP_INSTALL) -r "$@.txt" -q
-
-pip-test-requirements:
-	@echo "Installing cloud-init test dependencies..."
-	$(PIP_INSTALL) -r "$@.txt" -q
-
-test: $(unittests)
-
-check_version:
-	@if [ "$(CHANGELOG_VERSION)" != "$(CODE_VERSION)" ]; then \
-	    echo "Error: ChangeLog version $(CHANGELOG_VERSION)" \
-	    "not equal to code version $(CODE_VERSION)"; exit 2; \
-	    else true; fi
-
-clean_pyc:
-	@find . -type f -name "*.pyc" -delete
-
-clean: clean_pyc
-	rm -rf /var/log/cloud-init.log /var/lib/cloud/
-
-yaml:
-	@$(CWD)/tools/validate-yaml.py $(YAML_FILES)
-
-rpm:
-	./packages/brpm --distro $(distro)
-
-deb:
-	./packages/bddeb
-
-.PHONY: test pyflakes pyflakes3 clean pep8 rpm deb yaml check_version
-.PHONY: pip-test-requirements pip-requirements clean_pyc unittest unittest3

=== added file 'README'
--- README	1970-01-01 00:00:00 +0000
+++ README	2016-08-10 14:35:36 +0000
@@ -0,0 +1,11 @@
+cloud-init development has moved its revision control to git.
+It is available at 
+  https://code.launchpad.net/cloud-init
+
+Clone with 
+  git clone https://git.launchpad.net/cloud-init
+or
+  git clone git+ssh://git.launchpad.net/cloud-ini
+
+For more information see
+  https://git.launchpad.net/cloud-init/tree/HACKING.rst

=== removed file 'TODO.rst'
--- TODO.rst	2014-07-07 20:03:32 +0000
+++ TODO.rst	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-==============================================
-Things that cloud-init may do (better) someday
-==============================================
-
-- Consider making ``failsafe`` ``DataSource``
-  - sets the user password, writing it to console
-
-- Consider a ``previous`` ``DataSource``, if no other data source is
-  found, fall back to the ``previous`` one that worked.
-- Rewrite ``cloud-init-query`` (currently not implemented)
-- Possibly have a ``DataSource`` expose explicit fields:
-
-  - instance-id
-  - hostname
-  - mirror
-  - release
-  - ssh public keys
-
-- Remove the conversion of the ubuntu network interface format conversion
-  to a RH/fedora format and replace it with a top level format that uses
-  the netcf libraries format instead (which itself knows how to translate
-  into the specific formats). See for example `netcf`_ which seems to be
-  an active project that has this capability.
-- Replace the ``apt*`` modules with variants that now use the distro classes
-  to perform distro independent packaging commands (wherever possible).
-- Replace some the LOG.debug calls with a LOG.info where appropriate instead
-  of how right now there is really only 2 levels (``WARN`` and ``DEBUG``)
-- Remove the ``cc_`` prefix for config modules, either have them fully
-  specified (ie ``cloudinit.config.resizefs``) or by default only look in
-  the ``cloudinit.config`` namespace for these modules (or have a combination
-  of the above), this avoids having to understand where your modules are
-  coming from (which can be altered by the current python inclusion path)
-- Instead of just warning when a module is being ran on a ``unknown``
-  distribution perhaps we should not run that module in that case? Or we might
-  want to start reworking those modules so they will run on all
-  distributions? Or if that is not the case, then maybe we want to allow
-  fully specified python paths for modules and start encouraging
-  packages of ``ubuntu`` modules, packages of ``rhel`` specific modules that
-  people can add instead of having them all under the  cloud-init ``root``
-  tree? This might encourage more development of other modules instead of
-  having to go edit the cloud-init code to accomplish this.
-
-.. _netcf: https://fedorahosted.org/netcf/

=== removed directory 'bin'
=== removed file 'bin/cloud-init'
--- bin/cloud-init	2016-04-15 17:54:05 +0000
+++ bin/cloud-init	1970-01-01 00:00:00 +0000
@@ -1,673 +0,0 @@
-#!/usr/bin/python
-# vi: ts=4 expandtab
-#
-#    Copyright (C) 2012 Canonical Ltd.
-#    Copyright (C) 2012 Hewlett-Packard Development Company, L.P.
-#    Copyright (C) 2012 Yahoo! Inc.
-#
-#    Author: Scott Moser <[e-mail]>
-#    Author: Juerg Haefliger <[e-mail]>
-#    Author: Joshua Harlow <[e-mail]>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License version 3, as
-#    published by the Free Software Foundation.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import argparse
-import json
-import os
-import sys
-import time
-import tempfile
-import traceback
-
-# This is more just for running from the bin folder so that
-# cloud-init binary can find the cloudinit module
-possible_topdir = os.path.normpath(os.path.join(os.path.abspath(
-        sys.argv[0]), os.pardir, os.pardir))
-if os.path.exists(os.path.join(possible_topdir, "cloudinit", "__init__.py")):
-    sys.path.insert(0, possible_topdir)
-
-from cloudinit import patcher
-patcher.patch()
-
-from cloudinit import log as logging
-from cloudinit import netinfo
-from cloudinit import signal_handler
-from cloudinit import sources
-from cloudinit import stages
-from cloudinit import templater
-from cloudinit import util
-from cloudinit import reporting
-from cloudinit.reporting import events
-from cloudinit import version
-
-from cloudinit.settings import (PER_INSTANCE, PER_ALWAYS, PER_ONCE,
-                                CLOUD_CONFIG)
-
-
-# Pretty little cheetah formatted welcome message template
-WELCOME_MSG_TPL = ("Cloud-init v. ${version} running '${action}' at "
-                   "${timestamp}. Up ${uptime} seconds.")
-
-# Module section template
-MOD_SECTION_TPL = "cloud_%s_modules"
-
-# Things u can query on
-QUERY_DATA_TYPES = [
-    'data',
-    'data_raw',
-    'instance_id',
-]
-
-# Frequency shortname to full name
-# (so users don't have to remember the full name...)
-FREQ_SHORT_NAMES = {
-    'instance': PER_INSTANCE,
-    'always': PER_ALWAYS,
-    'once': PER_ONCE,
-}
-
-LOG = logging.getLogger()
-
-
-# Used for when a logger may not be active
-# and we still want to print exceptions...
-def print_exc(msg=''):
-    if msg:
-        sys.stderr.write("%s\n" % (msg))
-    sys.stderr.write('-' * 60)
-    sys.stderr.write("\n")
-    traceback.print_exc(file=sys.stderr)
-    sys.stderr.write('-' * 60)
-    sys.stderr.write("\n")
-
-
-def welcome(action, msg=None):
-    if not msg:
-        msg = welcome_format(action)
-    util.multi_log("%s\n" % (msg),
-                   console=False, stderr=True, log=LOG)
-    return msg
-
-
-def welcome_format(action):
-    tpl_params = {
-        'version': version.version_string(),
-        'uptime': util.uptime(),
-        'timestamp': util.time_rfc2822(),
-        'action': action,
-    }
-    return templater.render_string(WELCOME_MSG_TPL, tpl_params)
-
-
-def extract_fns(args):
-    # Files are already opened so lets just pass that along
-    # since it would of broke if it couldn't have
-    # read that file already...
-    fn_cfgs = []
-    if args.files:
-        for fh in args.files:
-            # The realpath is more useful in logging
-            # so lets resolve to that...
-            fn_cfgs.append(os.path.realpath(fh.name))
-    return fn_cfgs
-
-
-def run_module_section(mods, action_name, section):
-    full_section_name = MOD_SECTION_TPL % (section)
-    (which_ran, failures) = mods.run_section(full_section_name)
-    total_attempted = len(which_ran) + len(failures)
-    if total_attempted == 0:
-        msg = ("No '%s' modules to run"
-               " under section '%s'") % (action_name, full_section_name)
-        sys.stderr.write("%s\n" % (msg))
-        LOG.debug(msg)
-        return []
-    else:
-        LOG.debug("Ran %s modules with %s failures",
-                  len(which_ran), len(failures))
-        return failures
-
-
-def apply_reporting_cfg(cfg):
-    if cfg.get('reporting'):
-        reporting.update_configuration(cfg.get('reporting'))
-
-
-def main_init(name, args):
-    deps = [sources.DEP_FILESYSTEM, sources.DEP_NETWORK]
-    if args.local:
-        deps = [sources.DEP_FILESYSTEM]
-
-    if not args.local:
-        # See doc/kernel-cmdline.txt
-        #
-        # This is used in maas datasource, in "ephemeral" (read-only root)
-        # environment where the instance netboots to iscsi ro root.
-        # and the entity that controls the pxe config has to configure
-        # the maas datasource.
-        #
-        # Could be used elsewhere, only works on network based (not local).
-        root_name = "%s.d" % (CLOUD_CONFIG)
-        target_fn = os.path.join(root_name, "91_kernel_cmdline_url.cfg")
-        util.read_write_cmdline_url(target_fn)
-
-    # Cloud-init 'init' stage is broken up into the following sub-stages
-    # 1. Ensure that the init object fetches its config without errors
-    # 2. Setup logging/output redirections with resultant config (if any)
-    # 3. Initialize the cloud-init filesystem
-    # 4. Check if we can stop early by looking for various files
-    # 5. Fetch the datasource
-    # 6. Connect to the current instance location + update the cache
-    # 7. Consume the userdata (handlers get activated here)
-    # 8. Construct the modules object
-    # 9. Adjust any subsequent logging/output redirections using the modules
-    #    objects config as it may be different from init object
-    # 10. Run the modules for the 'init' stage
-    # 11. Done!
-    if not args.local:
-        w_msg = welcome_format(name)
-    else:
-        w_msg = welcome_format("%s-local" % (name))
-    init = stages.Init(ds_deps=deps, reporter=args.reporter)
-    # Stage 1
-    init.read_cfg(extract_fns(args))
-    # Stage 2
-    outfmt = None
-    errfmt = None
-    try:
-        LOG.debug("Closing stdin")
-        util.close_stdin()
-        (outfmt, errfmt) = util.fixup_output(init.cfg, name)
-    except:
-        util.logexc(LOG, "Failed to setup output redirection!")
-        print_exc("Failed to setup output redirection!")
-    if args.debug:
-        # Reset so that all the debug handlers are closed out
-        LOG.debug(("Logging being reset, this logger may no"
-                   " longer be active shortly"))
-        logging.resetLogging()
-    logging.setupLogging(init.cfg)
-    apply_reporting_cfg(init.cfg)
-
-    # Any log usage prior to setupLogging above did not have local user log
-    # config applied.  We send the welcome message now, as stderr/out have
-    # been redirected and log now configured.
-    welcome(name, msg=w_msg)
-
-    # Stage 3
-    try:
-        init.initialize()
-    except Exception:
-        util.logexc(LOG, "Failed to initialize, likely bad things to come!")
-    # Stage 4
-    path_helper = init.paths
-    if not args.local:
-        existing = "trust"
-        sys.stderr.write("%s\n" % (netinfo.debug_info()))
-        LOG.debug(("Checking to see if files that we need already"
-                   " exist from a previous run that would allow us"
-                   " to stop early."))
-        stop_files = [
-            os.path.join(path_helper.get_cpath("data"), "no-net"),
-            path_helper.get_ipath_cur("obj_pkl"),
-        ]
-        existing_files = []
-        for fn in stop_files:
-            try:
-                c = util.load_file(fn)
-                if len(c):
-                    existing_files.append((fn, len(c)))
-            except Exception:
-                pass
-        if existing_files:
-            LOG.debug("Exiting early due to the existence of %s files",
-                      existing_files)
-            return (None, [])
-        else:
-            LOG.debug("Execution continuing, no previous run detected that"
-                      " would allow us to stop early.")
-    else:
-        existing = "check"
-        if util.get_cfg_option_bool(init.cfg, 'manual_cache_clean', False):
-            existing = "trust"
-
-        init.purge_cache()
-        # Delete the non-net file as well
-        util.del_file(os.path.join(path_helper.get_cpath("data"), "no-net"))
-
-    # Stage 5
-    try:
-        init.fetch(existing=existing)
-    except sources.DataSourceNotFoundException:
-        # In the case of 'cloud-init init' without '--local' it is a bit
-        # more likely that the user would consider it failure if nothing was
-        # found. When using upstart it will also mentions job failure
-        # in console log if exit code is != 0.
-        if args.local:
-            LOG.debug("No local datasource found")
-        else:
-            util.logexc(LOG, ("No instance datasource found!"
-                              " Likely bad things to come!"))
-        if not args.force:
-            init.apply_network_config()
-            if args.local:
-                return (None, [])
-            else:
-                return (None, ["No instance datasource found."])
-
-    if args.local:
-        if not init.ds_restored:
-            # if local mode and the datasource was not restored from cache
-            # (this is not first boot) then apply networking.
-            init.apply_network_config()
-        else:
-            LOG.debug("skipping networking config from restored datasource.")
-
-    # Stage 6
-    iid = init.instancify()
-    LOG.debug("%s will now be targeting instance id: %s", name, iid)
-    init.update()
-    # Stage 7
-    try:
-        # Attempt to consume the data per instance.
-        # This may run user-data handlers and/or perform
-        # url downloads and such as needed.
-        (ran, _results) = init.cloudify().run('consume_data',
-                                              init.consume_data,
-                                              args=[PER_INSTANCE],
-                                              freq=PER_INSTANCE)
-        if not ran:
-            # Just consume anything that is set to run per-always
-            # if nothing ran in the per-instance code
-            #
-            # See: https://bugs.launchpad.net/bugs/819507 for a little
-            # reason behind this...
-            init.consume_data(PER_ALWAYS)
-    except Exception:
-        util.logexc(LOG, "Consuming user data failed!")
-        return (init.datasource, ["Consuming user data failed!"])
-
-    apply_reporting_cfg(init.cfg)
-
-    # Stage 8 - re-read and apply relevant cloud-config to include user-data
-    mods = stages.Modules(init, extract_fns(args), reporter=args.reporter)
-    # Stage 9
-    try:
-        outfmt_orig = outfmt
-        errfmt_orig = errfmt
-        (outfmt, errfmt) = util.get_output_cfg(mods.cfg, name)
-        if outfmt_orig != outfmt or errfmt_orig != errfmt:
-            LOG.warn("Stdout, stderr changing to (%s, %s)", outfmt, errfmt)
-            (outfmt, errfmt) = util.fixup_output(mods.cfg, name)
-    except:
-        util.logexc(LOG, "Failed to re-adjust output redirection!")
-    logging.setupLogging(mods.cfg)
-
-    # Stage 10
-    return (init.datasource, run_module_section(mods, name, name))
-
-
-def main_modules(action_name, args):
-    name = args.mode
-    # Cloud-init 'modules' stages are broken up into the following sub-stages
-    # 1. Ensure that the init object fetches its config without errors
-    # 2. Get the datasource from the init object, if it does
-    #    not exist then that means the main_init stage never
-    #    worked, and thus this stage can not run.
-    # 3. Construct the modules object
-    # 4. Adjust any subsequent logging/output redirections using
-    #    the modules objects configuration
-    # 5. Run the modules for the given stage name
-    # 6. Done!
-    w_msg = welcome_format("%s:%s" % (action_name, name))
-    init = stages.Init(ds_deps=[], reporter=args.reporter)
-    # Stage 1
-    init.read_cfg(extract_fns(args))
-    # Stage 2
-    try:
-        init.fetch(existing="trust")
-    except sources.DataSourceNotFoundException:
-        # There was no datasource found, theres nothing to do
-        msg = ('Can not apply stage %s, no datasource found! Likely bad '
-               'things to come!' % name)
-        util.logexc(LOG, msg)
-        print_exc(msg)
-        if not args.force:
-            return [(msg)]
-    # Stage 3
-    mods = stages.Modules(init, extract_fns(args), reporter=args.reporter)
-    # Stage 4
-    try:
-        LOG.debug("Closing stdin")
-        util.close_stdin()
-        util.fixup_output(mods.cfg, name)
-    except:
-        util.logexc(LOG, "Failed to setup output redirection!")
-    if args.debug:
-        # Reset so that all the debug handlers are closed out
-        LOG.debug(("Logging being reset, this logger may no"
-                   " longer be active shortly"))
-        logging.resetLogging()
-    logging.setupLogging(mods.cfg)
-    apply_reporting_cfg(init.cfg)
-
-    # now that logging is setup and stdout redirected, send welcome
-    welcome(name, msg=w_msg)
-
-    # Stage 5
-    return run_module_section(mods, name, name)
-
-
-def main_query(name, _args):
-    raise NotImplementedError(("Action '%s' is not"
-                               " currently implemented") % (name))
-
-
-def main_single(name, args):
-    # Cloud-init single stage is broken up into the following sub-stages
-    # 1. Ensure that the init object fetches its config without errors
-    # 2. Attempt to fetch the datasource (warn if it doesn't work)
-    # 3. Construct the modules object
-    # 4. Adjust any subsequent logging/output redirections using
-    #    the modules objects configuration
-    # 5. Run the single module
-    # 6. Done!
-    mod_name = args.name
-    w_msg = welcome_format(name)
-    init = stages.Init(ds_deps=[], reporter=args.reporter)
-    # Stage 1
-    init.read_cfg(extract_fns(args))
-    # Stage 2
-    try:
-        init.fetch(existing="trust")
-    except sources.DataSourceNotFoundException:
-        # There was no datasource found,
-        # that might be bad (or ok) depending on
-        # the module being ran (so continue on)
-        util.logexc(LOG, ("Failed to fetch your datasource,"
-                          " likely bad things to come!"))
-        print_exc(("Failed to fetch your datasource,"
-                   " likely bad things to come!"))
-        if not args.force:
-            return 1
-    # Stage 3
-    mods = stages.Modules(init, extract_fns(args), reporter=args.reporter)
-    mod_args = args.module_args
-    if mod_args:
-        LOG.debug("Using passed in arguments %s", mod_args)
-    mod_freq = args.frequency
-    if mod_freq:
-        LOG.debug("Using passed in frequency %s", mod_freq)
-        mod_freq = FREQ_SHORT_NAMES.get(mod_freq)
-    # Stage 4
-    try:
-        LOG.debug("Closing stdin")
-        util.close_stdin()
-        util.fixup_output(mods.cfg, None)
-    except:
-        util.logexc(LOG, "Failed to setup output redirection!")
-    if args.debug:
-        # Reset so that all the debug handlers are closed out
-        LOG.debug(("Logging being reset, this logger may no"
-                   " longer be active shortly"))
-        logging.resetLogging()
-    logging.setupLogging(mods.cfg)
-    apply_reporting_cfg(init.cfg)
-
-    # now that logging is setup and stdout redirected, send welcome
-    welcome(name, msg=w_msg)
-
-    # Stage 5
-    (which_ran, failures) = mods.run_single(mod_name,
-                                            mod_args,
-                                            mod_freq)
-    if failures:
-        LOG.warn("Ran %s but it failed!", mod_name)
-        return 1
-    elif not which_ran:
-        LOG.warn("Did not run %s, does it exist?", mod_name)
-        return 1
-    else:
-        # Guess it worked
-        return 0
-
-
-def atomic_write_file(path, content, mode='w'):
-    tf = None
-    try:
-        tf = tempfile.NamedTemporaryFile(dir=os.path.dirname(path),
-                                         delete=False, mode=mode)
-        tf.write(content)
-        tf.close()
-        os.rename(tf.name, path)
-    except Exception as e:
-        if tf is not None:
-            os.unlink(tf.name)
-        raise e
-
-
-def atomic_write_json(path, data):
-    return atomic_write_file(path, json.dumps(data, indent=1) + "\n")
-
-
-def status_wrapper(name, args, data_d=None, link_d=None):
-    if data_d is None:
-        data_d = os.path.normpath("/var/lib/cloud/data")
-    if link_d is None:
-        link_d = os.path.normpath("/run/cloud-init")
-
-    status_path = os.path.join(data_d, "status.json")
-    status_link = os.path.join(link_d, "status.json")
-    result_path = os.path.join(data_d, "result.json")
-    result_link = os.path.join(link_d, "result.json")
-
-    util.ensure_dirs((data_d, link_d,))
-
-    (_name, functor) = args.action
-
-    if name == "init":
-        if args.local:
-            mode = "init-local"
-        else:
-            mode = "init"
-    elif name == "modules":
-        mode = "modules-%s" % args.mode
-    else:
-        raise ValueError("unknown name: %s" % name)
-
-    modes = ('init', 'init-local', 'modules-config', 'modules-final')
-
-    status = None
-    if mode == 'init-local':
-        for f in (status_link, result_link, status_path, result_path):
-            util.del_file(f)
-    else:
-        try:
-            status = json.loads(util.load_file(status_path))
-        except:
-            pass
-
-    if status is None:
-        nullstatus = {
-            'errors': [],
-            'start': None,
-            'finished': None,
-        }
-        status = {'v1': {}}
-        for m in modes:
-            status['v1'][m] = nullstatus.copy()
-        status['v1']['datasource'] = None
-
-    v1 = status['v1']
-    v1['stage'] = mode
-    v1[mode]['start'] = time.time()
-
-    atomic_write_json(status_path, status)
-    util.sym_link(os.path.relpath(status_path, link_d), status_link,
-                  force=True)
-
-    try:
-        ret = functor(name, args)
-        if mode in ('init', 'init-local'):
-            (datasource, errors) = ret
-            if datasource is not None:
-                v1['datasource'] = str(datasource)
-        else:
-            errors = ret
-
-        v1[mode]['errors'] = [str(e) for e in errors]
-
-    except Exception as e:
-        util.logexc(LOG, "failed of stage %s", mode)
-        print_exc("failed run of stage %s" % mode)
-        v1[mode]['errors'] = [str(e)]
-
-    v1[mode]['finished'] = time.time()
-    v1['stage'] = None
-
-    atomic_write_json(status_path, status)
-
-    if mode == "modules-final":
-        # write the 'finished' file
-        errors = []
-        for m in modes:
-            if v1[m]['errors']:
-                errors.extend(v1[m].get('errors', []))
-
-        atomic_write_json(result_path,
-                          {'v1': {'datasource': v1['datasource'],
-                                  'errors': errors}})
-        util.sym_link(os.path.relpath(result_path, link_d), result_link,
-                      force=True)
-
-    return len(v1[mode]['errors'])
-
-
-def main():
-    parser = argparse.ArgumentParser()
-
-    # Top level args
-    parser.add_argument('--version', '-v', action='version',
-                        version='%(prog)s ' + (version.version_string()))
-    parser.add_argument('--file', '-f', action='append',
-                        dest='files',
-                        help=('additional yaml configuration'
-                              ' files to use'),
-                        type=argparse.FileType('rb'))
-    parser.add_argument('--debug', '-d', action='store_true',
-                        help=('show additional pre-action'
-                              ' logging (default: %(default)s)'),
-                        default=False)
-    parser.add_argument('--force', action='store_true',
-                        help=('force running even if no datasource is'
-                              ' found (use at your own risk)'),
-                        dest='force',
-                        default=False)
-
-    parser.set_defaults(reporter=None)
-    subparsers = parser.add_subparsers()
-
-    # Each action and its sub-options (if any)
-    parser_init = subparsers.add_parser('init',
-                                        help=('initializes cloud-init and'
-                                              ' performs initial modules'))
-    parser_init.add_argument("--local", '-l', action='store_true',
-                             help="start in local mode (default: %(default)s)",
-                             default=False)
-    # This is used so that we can know which action is selected +
-    # the functor to use to run this subcommand
-    parser_init.set_defaults(action=('init', main_init))
-
-    # These settings are used for the 'config' and 'final' stages
-    parser_mod = subparsers.add_parser('modules',
-                                       help=('activates modules using '
-                                             'a given configuration key'))
-    parser_mod.add_argument("--mode", '-m', action='store',
-                            help=("module configuration name "
-                                  "to use (default: %(default)s)"),
-                            default='config',
-                            choices=('init', 'config', 'final'))
-    parser_mod.set_defaults(action=('modules', main_modules))
-
-    # These settings are used when you want to query information
-    # stored in the cloud-init data objects/directories/files
-    parser_query = subparsers.add_parser('query',
-                                         help=('query information stored '
-                                               'in cloud-init'))
-    parser_query.add_argument("--name", '-n', action="store",
-                              help="item name to query on",
-                              required=True,
-                              choices=QUERY_DATA_TYPES)
-    parser_query.set_defaults(action=('query', main_query))
-
-    # This subcommand allows you to run a single module
-    parser_single = subparsers.add_parser('single',
-                                          help=('run a single module '))
-    parser_single.set_defaults(action=('single', main_single))
-    parser_single.add_argument("--name", '-n', action="store",
-                               help="module name to run",
-                               required=True)
-    parser_single.add_argument("--frequency", action="store",
-                               help=("frequency of the module"),
-                               required=False,
-                               choices=list(FREQ_SHORT_NAMES.keys()))
-    parser_single.add_argument("--report", action="store_true",
-                               help="enable reporting",
-                               required=False)
-    parser_single.add_argument("module_args", nargs="*",
-                               metavar='argument',
-                               help=('any additional arguments to'
-                                     ' pass to this module'))
-    parser_single.set_defaults(action=('single', main_single))
-
-    args = parser.parse_args()
-
-    # Setup basic logging to start (until reinitialized)
-    # iff in debug mode...
-    if args.debug:
-        logging.setupBasicLogging()
-
-    # Setup signal handlers before running
-    signal_handler.attach_handlers()
-
-    if not hasattr(args, 'action'):
-        parser.error('too few arguments')
-    (name, functor) = args.action
-    if name in ("modules", "init"):
-        functor = status_wrapper
-
-    report_on = True
-    if name == "init":
-        if args.local:
-            rname, rdesc = ("init-local", "searching for local datasources")
-        else:
-            rname, rdesc = ("init-network",
-                            "searching for network datasources")
-    elif name == "modules":
-        rname, rdesc = ("modules-%s" % args.mode,
-                        "running modules for %s" % args.mode)
-    elif name == "single":
-        rname, rdesc = ("single/%s" % args.name,
-                        "running single module %s" % args.name)
-        report_on = args.report
-
-    args.reporter = events.ReportEventStack(
-        rname, rdesc, reporting_enabled=report_on)
-    with args.reporter:
-        return util.log_time(
-            logfunc=LOG.debug, msg="cloud-init mode '%s'" % name,
-            get_uptime=True, func=functor, args=(name, args))
-
-
-if __name__ == '__main__':
-    sys.exit(main())

=== removed file 'cloudinit/__init__.py'
--- cloudinit/__init__.py	2012-06-29 18:29:37 +0000
+++ cloudinit/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-# vi: ts=4 expandtab
-#
-#    Copyright (C) 2012 Canonical Ltd.
-#    Copyright (C) 2012 Hewlett-Packard Development Company, L.P.
-#    Copyright (C) 2012 Yahoo! Inc.
-#
-#    Author: Scott Moser <[e-mail]>
-#    Author: Juerg Haefliger <[e-mail]>
-#    Author: Joshua Harlow <[e-mail]>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License version 3, as
-#    published by the Free Software Foundation.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.

=== removed file 'cloudinit/cloud.py'
--- cloudinit/cloud.py	2015-08-31 17:33:30 +0000
+++ cloudinit/cloud.py	1970-01-01 00:00:00 +0000
@@ -1,109 +0,0 @@
-# vi: ts=4 expandtab
-#
-#    Copyright (C) 2012 Canonical Ltd.
-#    Copyright (C) 2012 Hewlett-Packard Development Company, L.P.
-#    Copyright (C) 2012 Yahoo! Inc.
-#
-#    Author: Scott Moser <[e-mail]>
-#    Author: Juerg Haefliger <[e-mail]>
-#    Author: Joshua Harlow <[e-mail]>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License version 3, as
-#    published by the Free Software Foundation.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import copy
-import os
-
-from cloudinit import log as logging
-from cloudinit.reporting import events
-
-LOG = logging.getLogger(__name__)
-
-# This class is the high level wrapper that provides
-# access to cloud-init objects without exposing the stage objects
-# to handler and or module manipulation. It allows for cloud
-# init to restrict what those types of user facing code may see
-# and or adjust (which helps avoid code messing with each other)
-#
-# It also provides util functions that avoid having to know
-# how to get a certain member from this submembers as well
-# as providing a backwards compatible object that can be maintained
-# while the stages/other objects can be worked on independently...
-
-
-class Cloud(object):
-    def __init__(self, datasource, paths, cfg, distro, runners, reporter=None):
-        self.datasource = datasource
-        self.paths = paths
-        self.distro = distro
-        self._cfg = cfg
-        self._runners = runners
-        if reporter is None:
-            reporter = events.ReportEventStack(
-                name="unnamed-cloud-reporter",
-                description="unnamed-cloud-reporter",
-                reporting_enabled=False)
-        self.reporter = reporter
-
-    # If a 'user' manipulates logging or logging services
-    # it is typically useful to cause the logging to be
-    # setup again.
-    def cycle_logging(self):
-        logging.resetLogging()
-        logging.setupLogging(self.cfg)
-
-    @property
-    def cfg(self):
-        # Ensure that not indirectly modified
-        return copy.deepcopy(self._cfg)
-
-    def run(self, name, functor, args, freq=None, clear_on_fail=False):
-        return self._runners.run(name, functor, args, freq, clear_on_fail)
-
-    def get_template_filename(self, name):
-        fn = self.paths.template_tpl % (name)
-        if not os.path.isfile(fn):
-            LOG.warn("No template found at %s for template named %s", fn, name)
-            return None
-        return fn
-
-    # The rest of thes are just useful proxies
-    def get_userdata(self, apply_filter=True):
-        return self.datasource.get_userdata(apply_filter)
-
-    def get_instance_id(self):
-        return self.datasource.get_instance_id()
-
-    @property
-    def launch_index(self):
-        return self.datasource.launch_index
-
-    def get_public_ssh_keys(self):
-        return self.datasource.get_public_ssh_keys()
-
-    def get_locale(self):
-        return self.datasource.get_locale()
-
-    def get_hostname(self, fqdn=False):
-        return self.datasource.get_hostname(fqdn=fqdn)
-
-    def device_name_to_device(self, name):
-        return self.datasource.device_name_to_device(name)
-
-    def get_ipath_cur(self, name=None):
-        return self.paths.get_ipath_cur(name)
-
-    def get_cpath(self, name=None):
-        return self.paths.get_cpath(name)
-
-    def get_ipath(self, name=None):
-        return self.paths.get_ipath(name)

=== removed file 'cloudinit/config/__init__.py'
--- cloudinit/config/__init__.py	2013-01-15 21:08:43 +0000
+++ cloudinit/config/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
-# vi: ts=4 expandtab
-#
-#    Copyright (C) 2008-2010 Canonical Ltd.
-#    Copyright (C) 2012 Hewlett-Packard Development Company, L.P.
-#
-#    Author: Chuck Short <[e-mail]>
-#    Author: Juerg Haefliger <[e-mail]>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License version 3, as
-#    published by the Free Software Foundation.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-from cloudinit.settings import (PER_INSTANCE, FREQUENCIES)
-
-from cloudinit import log as logging
-
-LOG = logging.getLogger(__name__)
-
-# This prefix is used to make it less
-# of a chance that when importing
-# we will not find something else with the same
-# name in the lookup path...
-MOD_PREFIX = "cc_"
-
-
-def form_module_name(name):
-    canon_name = name.replace("-", "_")
-    if canon_name.lower().endswith(".py"):
-        canon_name = canon_name[0:(len(canon_name) - 3)]
-    canon_name = canon_name.strip()
-    if not canon_name:
-        return None
-    if not canon_name.startswith(MOD_PREFIX):
-        canon_name = '%s%s' % (MOD_PREFIX, canon_name)
-    return canon_name
-
-
-def fixup_module(mod, def_freq=PER_INSTANCE):
-    if not hasattr(mod, 'frequency'):
-        setattr(mod, 'frequency', def_freq)
-    else:
-        freq = mod.frequency
-        if freq and freq not in FREQUENCIES:
-            LOG.warn("Module %s has an unknown frequency %s", mod, freq)
-    if not hasattr(mod, 'distros'):
-        setattr(mod, 'distros', [])
-    if not hasattr(mod, 'osfamilies'):
-        setattr(mod, 'osfamilies', [])
-    return mod

=== removed file 'cloudinit/config/cc_apt_configure.py'
--- cloudinit/config/cc_apt_configure.py	2016-05-12 17:56:26 +0000
+++ cloudinit/config/cc_apt_configure.py	1970-01-01 00:00:00 +0000
@@ -1,292 +0,0 @@
-# vi: ts=4 expandtab
-#
-#    Copyright (C) 2009-2010 Canonical Ltd.
-#    Copyright (C) 2012 Hewlett-Packard Development Company, L.P.
-#
-#    Author: Scott Moser <[e-mail]>
-#    Author: Juerg Haefliger <[e-mail]>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License version 3, as
-#    published by the Free Software Foundation.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import glob
-import os
-import re
-
-from cloudinit import templater
-from cloudinit import util
-
-distros = ['ubuntu', 'debian']
-
-PROXY_TPL = "Acquire::HTTP::Proxy \"%s\";\n"
-APT_CONFIG_FN = "/etc/apt/apt.conf.d/94cloud-init-config"
-APT_PROXY_FN = "/etc/apt/apt.conf.d/95cloud-init-proxy"
-
-# this will match 'XXX:YYY' (ie, 'cloud-archive:foo' or 'ppa:bar')
-ADD_APT_REPO_MATCH = r"^[\w-]+:\w"
-
-# A temporary shell program to get a given gpg key
-# from a given keyserver
-EXPORT_GPG_KEYID = """
-    k=${1} ks=${2};
-    exec 2>/dev/null
-    [ -n "$k" ] || exit 1;
-    armour=$(gpg --list-keys --armour "${k}")
-    if [ -z "${armour}" ]; then
-       gpg --keyserver ${ks} --recv $k >/dev/null &&
-          armour=$(gpg --export --armour "${k}") &&
-          gpg --batch --yes --delete-keys "${k}"
-    fi
-    [ -n "${armour}" ] && echo "${armour}"
-"""
-
-
-def handle(name, cfg, cloud, log, _args):
-    if util.is_false(cfg.get('apt_configure_enabled', True)):
-        log.debug("Skipping module named %s, disabled by config.", name)
-        return
-
-    release = get_release()
-    mirrors = find_apt_mirror_info(cloud, cfg)
-    if not mirrors or "primary" not in mirrors:
-        log.debug(("Skipping module named %s,"
-                   " no package 'mirror' located"), name)
-        return
-
-    # backwards compatibility
-    mirror = mirrors["primary"]
-    mirrors["mirror"] = mirror
-
-    log.debug("Mirror info: %s" % mirrors)
-
-    if not util.get_cfg_option_bool(cfg,
-                                    'apt_preserve_sources_list', False):
-        generate_sources_list(release, mirrors, cloud, log)
-        old_mirrors = cfg.get('apt_old_mirrors',
-                              {"primary": "archive.ubuntu.com/ubuntu",
-                               "security": "security.ubuntu.com/ubuntu"})
-        rename_apt_lists(old_mirrors, mirrors)
-
-    try:
-        apply_apt_config(cfg, APT_PROXY_FN, APT_CONFIG_FN)
-    except Exception as e:
-        log.warn("failed to proxy or apt config info: %s", e)
-
-    # Process 'apt_sources'
-    if 'apt_sources' in cfg:
-        params = mirrors
-        params['RELEASE'] = release
-        params['MIRROR'] = mirror
-
-        matchcfg = cfg.get('add_apt_repo_match', ADD_APT_REPO_MATCH)
-        if matchcfg:
-            matcher = re.compile(matchcfg).search
-        else:
-            def matcher(x):
-                return False
-
-        errors = add_sources(cfg['apt_sources'], params,
-                             aa_repo_match=matcher)
-        for e in errors:
-            log.warn("Add source error: %s", ':'.join(e))
-
-    dconf_sel = util.get_cfg_option_str(cfg, 'debconf_selections', False)
-    if dconf_sel:
-        log.debug("Setting debconf selections per cloud config")
-        try:
-            util.subp(('debconf-set-selections', '-'), dconf_sel)
-        except Exception:
-            util.logexc(log, "Failed to run debconf-set-selections")
-
-
-# get gpg keyid from keyserver
-def getkeybyid(keyid, keyserver):
-    with util.ExtendedTemporaryFile(suffix='.sh', mode="w+", ) as fh:
-        fh.write(EXPORT_GPG_KEYID)
-        fh.flush()
-        cmd = ['/bin/sh', fh.name, keyid, keyserver]
-        (stdout, _stderr) = util.subp(cmd)
-        return stdout.strip()
-
-
-def mirror2lists_fileprefix(mirror):
-    string = mirror
-    # take off http:// or ftp://
-    if string.endswith("/"):
-        string = string[0:-1]
-    pos = string.find("://")
-    if pos >= 0:
-        string = string[pos + 3:]
-    string = string.replace("/", "_")
-    return string
-
-
-def rename_apt_lists(old_mirrors, new_mirrors, lists_d="/var/lib/apt/lists"):
-    for (name, omirror) in old_mirrors.items():
-        nmirror = new_mirrors.get(name)
-        if not nmirror:
-            continue
-        oprefix = os.path.join(lists_d, mirror2lists_fileprefix(omirror))
-        nprefix = os.path.join(lists_d, mirror2lists_fileprefix(nmirror))
-        if oprefix == nprefix:
-            continue
-        olen = len(oprefix)
-        for filename in glob.glob("%s_*" % oprefix):
-            util.rename(filename, "%s%s" % (nprefix, filename[olen:]))
-
-
-def get_release():
-    (stdout, _stderr) = util.subp(['lsb_release', '-cs'])
-    return stdout.strip()
-
-
-def generate_sources_list(codename, mirrors, cloud, log):
-    template_fn = cloud.get_template_filename('sources.list.%s' %
-                                              (cloud.distro.name))
-    if not template_fn:
-        template_fn = cloud.get_template_filename('sources.list')
-        if not template_fn:
-            log.warn("No template found, not rendering /etc/apt/sources.list")
-            return
-
-    params = {'codename': codename}
-    for k in mirrors:
-        params[k] = mirrors[k]
-    templater.render_to_file(template_fn, '/etc/apt/sources.list', params)
-
-
-def add_sources(srclist, template_params=None, aa_repo_match=None):
-    """
-    add entries in /etc/apt/sources.list.d for each abbreviated
-    sources.list entry in 'srclist'.  When rendering template, also
-    include the values in dictionary searchList
-    """
-    if template_params is None:
-        template_params = {}
-
-    if aa_repo_match is None:
-        def aa_repo_match(x):
-            return False
-
-    errorlist = []
-    for ent in srclist:
-        if 'source' not in ent:
-            errorlist.append(["", "missing source"])
-            continue
-
-        source = ent['source']
-        source = templater.render_string(source, template_params)
-
-        if aa_repo_match(source):
-            try:
-                util.subp(["add-apt-repository", source])
-            except util.ProcessExecutionError as e:
-                errorlist.append([source,
-                                  ("add-apt-repository failed. " + str(e))])
-            continue
-
-        if 'filename' not in ent:
-            ent['filename'] = 'cloud_config_sources.list'
-
-        if not ent['filename'].startswith("/"):
-            ent['filename'] = os.path.join("/etc/apt/sources.list.d/",
-                                           ent['filename'])
-
-        if ('keyid' in ent and 'key' not in ent):
-            ks = "keyserver.ubuntu.com"
-            if 'keyserver' in ent:
-                ks = ent['keyserver']
-            try:
-                ent['key'] = getkeybyid(ent['keyid'], ks)
-            except Exception:
-                errorlist.append([source, "failed to get key from %s" % ks])
-                continue
-
-        if 'key' in ent:
-            try:
-                util.subp(('apt-key', 'add', '-'), ent['key'])
-            except Exception:
-                errorlist.append([source, "failed add key"])
-
-        try:
-            contents = "%s\n" % (source)
-            util.write_file(ent['filename'], contents, omode="ab")
-        except Exception:
-            errorlist.append([source,
-                             "failed write to file %s" % ent['filename']])
-
-    return errorlist
-
-
-def find_apt_mirror_info(cloud, cfg):
-    """find an apt_mirror given the cloud and cfg provided."""
-
-    mirror = None
-
-    # this is less preferred way of specifying mirror preferred would be to
-    # use the distro's search or package_mirror.
-    mirror = cfg.get("apt_mirror", None)
-
-    search = cfg.get("apt_mirror_search", None)
-    if not mirror and search:
-        mirror = util.search_for_mirror(search)
-
-    if (not mirror and
-            util.get_cfg_option_bool(cfg, "apt_mirror_search_dns", False)):
-        mydom = ""
-        doms = []
-
-        # if we have a fqdn, then search its domain portion first
-        (_hostname, fqdn) = util.get_hostname_fqdn(cfg, cloud)
-        mydom = ".".join(fqdn.split(".")[1:])
-        if mydom:
-            doms.append(".%s" % mydom)
-
-        doms.extend((".localdomain", "",))
-
-        mirror_list = []
-        distro = cloud.distro.name
-        mirrorfmt = "http://%s-mirror%s/%s" % (distro, "%s", distro)
-        for post in doms:
-            mirror_list.append(mirrorfmt % (post))
-
-        mirror = util.search_for_mirror(mirror_list)
-
-    mirror_info = cloud.datasource.get_package_mirror_info()
-
-    # this is a bit strange.
-    # if mirror is set, then one of the legacy options above set it
-    # but they do not cover security. so we need to get that from
-    # get_package_mirror_info
-    if mirror:
-        mirror_info.update({'primary': mirror})
-
-    return mirror_info
-
-
-def apply_apt_config(cfg, proxy_fname, config_fname):
-    # Set up any apt proxy
-    cfgs = (('apt_proxy', 'Acquire::HTTP::Proxy "%s";'),
-            ('apt_http_proxy', 'Acquire::HTTP::Proxy "%s";'),
-            ('apt_ftp_proxy', 'Acquire::FTP::Proxy "%s";'),
-            ('apt_https_proxy', 'Acquire::HTTPS::Proxy "%s";'))
-
-    proxies = [fmt % cfg.get(name) for (name, fmt) in cfgs if cfg.get(name)]
-    if len(proxies):
-        util.write_file(proxy_fname, '\n'.join(proxies) + '\n')
-    elif os.path.isfile(proxy_fname):
-        util.del_file(proxy_fname)
-
-    if cfg.get('apt_config', None):
-        util.write_file(config_fname, cfg.get('apt_config'))
-    elif os.path.isfile(config_fname):
-        util.del_file(config_fname)

=== removed file 'cloudinit/config/cc_apt_pipelining.py'
--- cloudinit/config/cc_apt_pipelining.py	2015-05-01 09:38:56 +0000
+++ cloudinit/config/cc_apt_pipelining.py	1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
-# vi: ts=4 expandtab
-#
-#    Copyright (C) 2011 Canonical Ltd.
-#
-#    Author: Ben Howard <[e-mail]>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License version 3, as
-#    published by the Free Software Foundation.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-from cloudinit.settings import PER_INSTANCE
-from cloudinit import util
-
-frequency = PER_INSTANCE
-
-distros = ['ubuntu', 'debian']
-
-DEFAULT_FILE = "/etc/apt/apt.conf.d/90cloud-init-pipelining"
-
-APT_PIPE_TPL = ("//Written by cloud-init per 'apt_pipelining'\n"
-                'Acquire::http::Pipeline-Depth "%s";\n')
-
-# Acquire::http::Pipeline-Depth can be a value
-# from 0 to 5 indicating how many outstanding requests APT should send.
-# A value of zero MUST be specified if the remote host does not properly linger
-# on TCP connections - otherwise data corruption will occur.
-
-
-def handle(_name, cfg, _cloud, log, _args):
-
-    apt_pipe_value = util.get_cfg_option_str(cfg, "apt_pipelining", False)
-    apt_pipe_value_s = str(apt_pipe_value).lower().strip()
-
-    if apt_pipe_value_s == "false":
-        write_apt_snippet("0", log, DEFAULT_FILE)
-    elif apt_pipe_value_s in ("none", "unchanged", "os"):
-        return
-    elif apt_pipe_value_s in [str(b) for b in range(0, 6)]:
-        write_apt_snippet(apt_pipe_value_s, log, DEFAULT_FILE)
-    else:
-        log.warn("Invalid option for apt_pipeling: %s", apt_pipe_value)
-
-
-def write_apt_snippet(setting, log, f_name):
-    """Writes f_name with apt pipeline depth 'setting'."""
-
-    file_contents = APT_PIPE_TPL % (setting)
-    util.write_file(f_name, file_contents)
-    log.debug("Wrote %s with apt pipeline depth setting %s", f_name, setting)

=== removed file 'cloudinit/config/cc_bootcmd.py'
--- cloudinit/config/cc_bootcmd.py	2016-05-12 17:56:26 +0000
+++ cloudinit/config/cc_bootcmd.py	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-# vi: ts=4 expandtab
-#
-#    Copyright (C) 2009-2011 Canonical Ltd.
-#    Copyright (C) 2012, 2013 Hewlett-Packard Development Company, L.P.
-#
-#    Author: Scott Moser <[e-mail]>
-#    Author: Juerg Haefliger <[e-mail]>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License version 3, as
-#    published by the Free Software Foundation.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import os
-
-from cloudinit.settings import PER_ALWAYS
-from cloudinit import util
-
-frequency = PER_ALWAYS
-
-
-def handle(name, cfg, cloud, log, _args):
-
-    if "bootcmd" not in cfg:
-        log.debug(("Skipping module named %s,"
-                   " no 'bootcmd' key in configuration"), name)
-        return
-
-    with util.ExtendedTemporaryFile(suffix=".sh") as tmpf:
-        try:
-            content = util.shellify(cfg["bootcmd"])
-            tmpf.write(util.encode_text(content))
-            tmpf.flush()
-        except Exception:
-            util.logexc(log, "Failed to shellify bootcmd")
-            raise
-
-        try:
-            env = os.environ.copy()
-            iid = cloud.get_instance_id()
-            if iid:
-                env['INSTANCE_ID'] = str(iid)
-            cmd = ['/bin/sh', tmpf.name]
-            util.subp(cmd, env=env, capture=False)
-        except Exception:
-            util.logexc(log, "Failed to run bootcmd module %s", name)
-            raise

=== removed file 'cloudinit/config/cc_byobu.py'
--- cloudinit/config/cc_byobu.py	2014-08-26 18:50:11 +0000
+++ cloudinit/config/cc_byobu.py	1970-01-01 00:00:00 +0000
@@ -1,80 +0,0 @@
-# vi: ts=4 expandtab
-#
-#    Copyright (C) 2009-2010 Canonical Ltd.
-#    Copyright (C) 2012 Hewlett-Packard Development Company, L.P.
-#
-#    Author: Scott Moser <[e-mail]>
-#    Author: Juerg Haefliger <[e-mail]>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License version 3, as
-#    published by the Free Software Foundation.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Ensure this is aliased to a name not 'distros'
-# since the module attribute 'distros'
-# is a list of distros that are supported, not a sub-module
-from cloudinit import distros as ds
-
-from cloudinit import util
-
-distros = ['ubuntu', 'debian']
-
-
-def handle(name, cfg, cloud, log, args):
-    if len(args) != 0:
-        value = args[0]
-    else:
-        value = util.get_cfg_option_str(cfg, "byobu_by_default", "")
-
-    if not value:
-        log.debug("Skipping module named %s, no 'byobu' values found", name)
-        return
-
-    if value == "user" or value == "system":
-        value = "enable-%s" % value
-
-    valid = ("enable-user", "enable-system", "enable",
-             "disable-user", "disable-system", "disable")
-    if value not in valid:
-        log.warn("Unknown value %s for byobu_by_default", value)
-
-    mod_user = value.endswith("-user")
-    mod_sys = value.endswith("-system")
-    if value.startswith("enable"):
-        bl_inst = "install"
-        dc_val = "byobu byobu/launch-by-default boolean true"
-        mod_sys = True
-    else:
-        if value == "disable":
-            mod_user = True
-            mod_sys = True
-        bl_inst = "uninstall"
-        dc_val = "byobu byobu/launch-by-default boolean false"
-
-    shcmd = ""
-    if mod_user:
-        (users, _groups) = ds.normalize_users_groups(cfg, cloud.distro)
-        (user, _user_config) = ds.extract_default(users)
-        if not user:
-            log.warn(("No default byobu user provided, "
-                      "can not launch %s for the default user"), bl_inst)
-        else:
-            shcmd += " sudo -Hu \"%s\" byobu-launcher-%s" % (user, bl_inst)
-            shcmd += " || X=$(($X+1)); "
-    if mod_sys:
-        shcmd += "echo \"%s\" | debconf-set-selections" % dc_val
-        shcmd += " && dpkg-reconfigure byobu --frontend=noninteractive"
-        shcmd += " || X=$(($X+1)); "
-
-    if len(shcmd):
-        cmd = ["/bin/sh", "-c", "%s %s %s" % ("X=0;", shcmd, "exit $X")]
-        log.debug("Setting byobu to %s", value)
-        util.subp(cmd, capture=False)

=== removed file 'cloudinit/config/cc_ca_certs.py'
--- cloudinit/config/cc_ca_certs.py	2015-01-23 02:21:04 +0000
+++ cloudinit/config/cc_ca_certs.py	1970-01-01 00:00:00 +0000
@@ -1,104 +0,0 @@
-# vi: ts=4 expandtab
-#
-#    Author: Mike Milner <[e-mail]>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License version 3, as
-#    published by the Free Software Foundation.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import os
-
-from cloudinit import util
-
-CA_CERT_PATH = "/usr/share/ca-certificates/"
-CA_CERT_FILENAME = "cloud-init-ca-certs.crt"
-CA_CERT_CONFIG = "/etc/ca-certificates.conf"
-CA_CERT_SYSTEM_PATH = "/etc/ssl/certs/"
-CA_CERT_FULL_PATH = os.path.join(CA_CERT_PATH, CA_CERT_FILENAME)
-
-distros = ['ubuntu', 'debian']
-
-
-def update_ca_certs():
-    """
-    Updates the CA certificate cache on the current machine.
-    """
-    util.subp(["update-ca-certificates"], capture=False)
-
-
-def add_ca_certs(certs):
-    """
-    Adds certificates to the system. To actually apply the new certificates
-    you must also call L{update_ca_certs}.
-
-    @param certs: A list of certificate strings.
-    """
-    if certs:
-        # First ensure they are strings...
-        cert_file_contents = "\n".join([str(c) for c in certs])
-        util.write_file(CA_CERT_FULL_PATH, cert_file_contents, mode=0o644)
-
-        # Append cert filename to CA_CERT_CONFIG file.
-        # We have to strip the content because blank lines in the file
-        # causes subsequent entries to be ignored. (LP: #1077020)
-        orig = util.load_file(CA_CERT_CONFIG)
-        cur_cont = '\n'.join([l for l in orig.splitlines()
-                              if l != CA_CERT_FILENAME])
-        out = "%s\n%s\n" % (cur_cont.rstrip(), CA_CERT_FILENAME)
-        util.write_file(CA_CERT_CONFIG, out, omode="wb")
-
-
-def remove_default_ca_certs():
-    """
-    Removes all default trusted CA certificates from the system. To actually
-    apply the change you must also call L{update_ca_certs}.
-    """
-    util.delete_dir_contents(CA_CERT_PATH)
-    util.delete_dir_contents(CA_CERT_SYSTEM_PATH)
-    util.write_file(CA_CERT_CONFIG, "", mode=0o644)
-    debconf_sel = "ca-certificates ca-certificates/trust_new_crts select no"
-    util.subp(('debconf-set-selections', '-'), debconf_sel)
-
-
-def handle(name, cfg, _cloud, log, _args):
-    """
-    Call to handle ca-cert sections in cloud-config file.
-
-    @param name: The module name "ca-cert" from cloud.cfg
-    @param cfg: A nested dict containing the entire cloud config contents.
-    @param cloud: The L{CloudInit} object in use.
-    @param log: Pre-initialized Python logger object to use for logging.
-    @param args: Any module arguments from cloud.cfg
-    """
-    # If there isn't a ca-certs section in the configuration don't do anything
-    if "ca-certs" not in cfg:
-        log.debug(("Skipping module named %s,"
-                   " no 'ca-certs' key in configuration"), name)
-        return
-
-    ca_cert_cfg = cfg['ca-certs']
-
-    # If there is a remove-defaults option set to true, remove the system
-    # default trusted CA certs first.
-    if ca_cert_cfg.get("remove-defaults", False):
-        log.debug("Removing default certificates")
-        remove_default_ca_certs()
-
-    # If we are given any new trusted CA certs to add, add them.
-    if "trusted" in ca_cert_cfg:
-        trusted_certs = util.get_cfg_option_list(ca_cert_cfg, "trusted")
-        if trusted_certs:
-            log.debug("Adding %d certificates" % len(trusted_certs))
-            add_ca_certs(trusted_certs)
-
-    # Update the system with the new cert configuration.
-    log.debug("Updating certificates")
-    update_ca_certs()

=== removed file 'cloudinit/config/cc_chef.py'
--- cloudinit/config/cc_chef.py	2016-04-13 16:24:46 +0000
+++ cloudinit/config/cc_chef.py	1970-01-01 00:00:00 +0000
@@ -1,342 +0,0 @@
-# vi: ts=4 expandtab
-#
-#    Copyright (C) 2012 Hewlett-Packard Development Company, L.P.
-#
-#    Author: Avishai Ish-Shalom <[e-mail]>
-#    Author: Mike Moulton <[e-mail]>
-#    Author: Juerg Haefliger <[e-mail]>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License version 3, as
-#    published by the Free Software Foundation.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-"""
-**Summary:** module that configures, starts and installs chef.
-
-**Description:** This module enables chef to be installed (from packages or
-from gems, or from omnibus). Before this occurs chef configurations are
-written to disk (validation.pem, client.pem, firstboot.json, client.rb),
-and needed chef folders/directories are created (/etc/chef and /var/log/chef
-and so-on). Then once installing proceeds correctly if configured chef will
-be started (in daemon mode or in non-daemon mode) and then once that has
-finished (if ran in non-daemon mode this will be when chef finishes
-converging, if ran in daemon mode then no further actions are possible since
-chef will have forked into its own process) then a post run function can
-run that can do finishing activities (such as removing the validation pem
-file).
-
-It can be configured with the following option structure::
-
-    chef:
-       directories: (defaulting to /etc/chef, /var/log/chef, /var/lib/chef,
-                     /var/cache/chef, /var/backups/chef, /var/run/chef)
-       validation_cert: (optional string to be written to file validation_key)
-                        special value 'system' means set use existing file
-       validation_key: (optional the path for validation_cert. default
-                        /etc/chef/validation.pem)
-       firstboot_path: (path to write run_list and initial_attributes keys that
-                        should also be present in this configuration, defaults
-                        to /etc/chef/firstboot.json)
-       exec: boolean to run or not run chef (defaults to false, unless
-                                             a gem installed is requested
-                                             where this will then default
-                                             to true)
-
-    chef.rb template keys (if falsey, then will be skipped and not
-                           written to /etc/chef/client.rb)
-
-    chef:
-      client_key:
-      environment:
-      file_backup_path:
-      file_cache_path:
-      json_attribs:
-      log_level:
-      log_location:
-      node_name:
-      pid_file:
-      server_url:
-      show_time:
-      ssl_verify_mode:
-      validation_cert:
-      validation_key:
-      validation_name:
-"""
-
-import itertools
-import json
-import os
-
-from cloudinit import templater
-from cloudinit import url_helper
-from cloudinit import util
-
-import six
-
-RUBY_VERSION_DEFAULT = "1.8"
-
-CHEF_DIRS = tuple([
-    '/etc/chef',
-    '/var/log/chef',
-    '/var/lib/chef',
-    '/var/cache/chef',
-    '/var/backups/chef',
-    '/var/run/chef',
-])
-REQUIRED_CHEF_DIRS = tuple([
-    '/etc/chef',
-])
-
-# Used if fetching chef from a omnibus style package
-OMNIBUS_URL = "https://www.getchef.com/chef/install.sh"
-OMNIBUS_URL_RETRIES = 5
-
-CHEF_VALIDATION_PEM_PATH = '/etc/chef/validation.pem'
-CHEF_FB_PATH = '/etc/chef/firstboot.json'
-CHEF_RB_TPL_DEFAULTS = {
-    # These are ruby symbols...
-    'ssl_verify_mode': ':verify_none',
-    'log_level': ':info',
-    # These are not symbols...
-    'log_location': '/var/log/chef/client.log',
-    'validation_key': CHEF_VALIDATION_PEM_PATH,
-    'validation_cert': None,
-    'client_key': "/etc/chef/client.pem",
-    'json_attribs': CHEF_FB_PATH,
-    'file_cache_path': "/var/cache/chef",
-    'file_backup_path': "/var/backups/chef",
-    'pid_file': "/var/run/chef/client.pid",
-    'show_time': True,
-}
-CHEF_RB_TPL_BOOL_KEYS = frozenset(['show_time'])
-CHEF_RB_TPL_PATH_KEYS = frozenset([
-    'log_location',
-    'validation_key',
-    'client_key',
-    'file_cache_path',
-    'json_attribs',
-    'file_cache_path',
-    'pid_file',
-])
-CHEF_RB_TPL_KEYS = list(CHEF_RB_TPL_DEFAULTS.keys())
-CHEF_RB_TPL_KEYS.extend(CHEF_RB_TPL_BOOL_KEYS)
-CHEF_RB_TPL_KEYS.extend(CHEF_RB_TPL_PATH_KEYS)
-CHEF_RB_TPL_KEYS.extend([
-    'server_url',
-    'node_name',
-    'environment',
-    'validation_name',
-])
-CHEF_RB_TPL_KEYS = frozenset(CHEF_RB_TPL_KEYS)
-CHEF_RB_PATH = '/etc/chef/client.rb'
-CHEF_EXEC_PATH = '/usr/bin/chef-client'
-CHEF_EXEC_DEF_ARGS = tuple(['-d', '-i', '1800', '-s', '20'])
-
-
-def is_installed():
-    if not os.path.isfile(CHEF_EXEC_PATH):
-        return False
-    if not os.access(CHEF_EXEC_PATH, os.X_OK):
-        return False
-    return True
-
-
-def post_run_chef(chef_cfg, log):
-    delete_pem = util.get_cfg_option_bool(chef_cfg,
-                                          'delete_validation_post_exec',
-                                          default=False)
-    if delete_pem and os.path.isfile(CHEF_VALIDATION_PEM_PATH):
-        os.unlink(CHEF_VALIDATION_PEM_PATH)
-
-
-def get_template_params(iid, chef_cfg, log):
-    params = CHEF_RB_TPL_DEFAULTS.copy()
-    # Allow users to overwrite any of the keys they want (if they so choose),
-    # when a value is None, then the value will be set to None and no boolean
-    # or string version will be populated...
-    for (k, v) in chef_cfg.items():
-        if k not in CHEF_RB_TPL_KEYS:
-            log.debug("Skipping unknown chef template key '%s'", k)
-            continue
-        if v is None:
-            params[k] = None
-        else:
-            # This will make the value a boolean or string...
-            if k in CHEF_RB_TPL_BOOL_KEYS:
-                params[k] = util.get_cfg_option_bool(chef_cfg, k)
-            else:
-                params[k] = util.get_cfg_option_str(chef_cfg, k)
-    # These ones are overwritten to be exact values...
-    params.update({
-        'generated_by': util.make_header(),
-        'node_name': util.get_cfg_option_str(chef_cfg, 'node_name',
-                                             default=iid),
-        'environment': util.get_cfg_option_str(chef_cfg, 'environment',
-                                               default='_default'),
-        # These two are mandatory...
-        'server_url': chef_cfg['server_url'],
-        'validation_name': chef_cfg['validation_name'],
-    })
-    return params
-
-
-def handle(name, cfg, cloud, log, _args):
-    """Handler method activated by cloud-init."""
-
-    # If there isn't a chef key in the configuration don't do anything
-    if 'chef' not in cfg:
-        log.debug(("Skipping module named %s,"
-                  " no 'chef' key in configuration"), name)
-        return
-    chef_cfg = cfg['chef']
-
-    # Ensure the chef directories we use exist
-    chef_dirs = util.get_cfg_option_list(chef_cfg, 'directories')
-    if not chef_dirs:
-        chef_dirs = list(CHEF_DIRS)
-    for d in itertools.chain(chef_dirs, REQUIRED_CHEF_DIRS):
-        util.ensure_dir(d)
-
-    vkey_path = chef_cfg.get('validation_key', CHEF_VALIDATION_PEM_PATH)
-    vcert = chef_cfg.get('validation_cert')
-    # special value 'system' means do not overwrite the file
-    # but still render the template to contain 'validation_key'
-    if vcert:
-        if vcert != "system":
-            util.write_file(vkey_path, vcert)
-        elif not os.path.isfile(vkey_path):
-            log.warn("chef validation_cert provided as 'system', but "
-                     "validation_key path '%s' does not exist.",
-                     vkey_path)
-
-    # Create the chef config from template
-    template_fn = cloud.get_template_filename('chef_client.rb')
-    if template_fn:
-        iid = str(cloud.datasource.get_instance_id())
-        params = get_template_params(iid, chef_cfg, log)
-        # Do a best effort attempt to ensure that the template values that
-        # are associated with paths have there parent directory created
-        # before they are used by the chef-client itself.
-        param_paths = set()
-        for (k, v) in params.items():
-            if k in CHEF_RB_TPL_PATH_KEYS and v:
-                param_paths.add(os.path.dirname(v))
-        util.ensure_dirs(param_paths)
-        templater.render_to_file(template_fn, CHEF_RB_PATH, params)
-    else:
-        log.warn("No template found, not rendering to %s",
-                 CHEF_RB_PATH)
-
-    # Set the firstboot json
-    fb_filename = util.get_cfg_option_str(chef_cfg, 'firstboot_path',
-                                          default=CHEF_FB_PATH)
-    if not fb_filename:
-        log.info("First boot path empty, not writing first boot json file")
-    else:
-        initial_json = {}
-        if 'run_list' in chef_cfg:
-            initial_json['run_list'] = chef_cfg['run_list']
-        if 'initial_attributes' in chef_cfg:
-            initial_attributes = chef_cfg['initial_attributes']
-            for k in list(initial_attributes.keys()):
-                initial_json[k] = initial_attributes[k]
-        util.write_file(fb_filename, json.dumps(initial_json))
-
-    # Try to install chef, if its not already installed...
-    force_install = util.get_cfg_option_bool(chef_cfg,
-                                             'force_install', default=False)
-    if not is_installed() or force_install:
-        run = install_chef(cloud, chef_cfg, log)
-    elif is_installed():
-        run = util.get_cfg_option_bool(chef_cfg, 'exec', default=False)
-    else:
-        run = False
-    if run:
-        run_chef(chef_cfg, log)
-        post_run_chef(chef_cfg, log)
-
-
-def run_chef(chef_cfg, log):
-    log.debug('Running chef-client')
-    cmd = [CHEF_EXEC_PATH]
-    if 'exec_arguments' in chef_cfg:
-        cmd_args = chef_cfg['exec_arguments']
-        if isinstance(cmd_args, (list, tuple)):
-            cmd.extend(cmd_args)
-        elif isinstance(cmd_args, six.string_types):
-            cmd.append(cmd_args)
-        else:
-            log.warn("Unknown type %s provided for chef"
-                     " 'exec_arguments' expected list, tuple,"
-                     " or string", type(cmd_args))
-            cmd.extend(CHEF_EXEC_DEF_ARGS)
-    else:
-        cmd.extend(CHEF_EXEC_DEF_ARGS)
-    util.subp(cmd, capture=False)
-
-
-def install_chef(cloud, chef_cfg, log):
-    # If chef is not installed, we install chef based on 'install_type'
-    install_type = util.get_cfg_option_str(chef_cfg, 'install_type',
-                                           'packages')
-    run = util.get_cfg_option_bool(chef_cfg, 'exec', default=False)
-    if install_type == "gems":
-        # This will install and run the chef-client from gems
-        chef_version = util.get_cfg_option_str(chef_cfg, 'version', None)
-        ruby_version = util.get_cfg_option_str(chef_cfg, 'ruby_version',
-                                               RUBY_VERSION_DEFAULT)
-        install_chef_from_gems(ruby_version, chef_version, cloud.distro)
-        # Retain backwards compat, by preferring True instead of False
-        # when not provided/overriden...
-        run = util.get_cfg_option_bool(chef_cfg, 'exec', default=True)
-    elif install_type == 'packages':
-        # This will install and run the chef-client from packages
-        cloud.distro.install_packages(('chef',))
-    elif install_type == 'omnibus':
-        # This will install as a omnibus unified package
-        url = util.get_cfg_option_str(chef_cfg, "omnibus_url", OMNIBUS_URL)
-        retries = max(0, util.get_cfg_option_int(chef_cfg,
-                                                 "omnibus_url_retries",
-                                                 default=OMNIBUS_URL_RETRIES))
-        content = url_helper.readurl(url=url, retries=retries)
-        with util.tempdir() as tmpd:
-            # Use tmpdir over tmpfile to avoid 'text file busy' on execute
-            tmpf = "%s/chef-omnibus-install" % tmpd
-            util.write_file(tmpf, content, mode=0o700)
-            util.subp([tmpf], capture=False)
-    else:
-        log.warn("Unknown chef install type '%s'", install_type)
-        run = False
-    return run
-
-
-def get_ruby_packages(version):
-    # return a list of packages needed to install ruby at version
-    pkgs = ['ruby%s' % version, 'ruby%s-dev' % version]
-    if version == "1.8":
-        pkgs.extend(('libopenssl-ruby1.8', 'rubygems1.8'))
-    return pkgs
-
-
-def install_chef_from_gems(ruby_version, chef_version, distro):
-    distro.install_packages(get_ruby_packages(ruby_version))
-    if not os.path.exists('/usr/bin/gem'):
-        util.sym_link('/usr/bin/gem%s' % ruby_version, '/usr/bin/gem')
-    if not os.path.exists('/usr/bin/ruby'):
-        util.sym_link('/usr/bin/ruby%s' % ruby_version, '/usr/bin/ruby')
-    if chef_version:
-        util.subp(['/usr/bin/gem', 'install', 'chef',
-                   '-v %s' % chef_version, '--no-ri',
-                   '--no-rdoc', '--bindir', '/usr/bin', '-q'], capture=False)
-    else:
-        util.subp(['/usr/bin/gem', 'install', 'chef',
-                   '--no-ri', '--no-rdoc', '--bindir',
-                   '/usr/bin', '-q'], capture=False)

=== removed file 'cloudinit/config/cc_debug.py'
--- cloudinit/config/cc_debug.py	2015-01-21 22:56:53 +0000
+++ cloudinit/config/cc_debug.py	1970-01-01 00:00:00 +0000
@@ -1,109 +0,0 @@
-# vi: ts=4 expandtab
-#
-#    Copyright (C) 2013 Yahoo! Inc.
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License version 3, as
-#    published by the Free Software Foundation.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-"""
-**Summary:** helper to debug cloud-init *internal* datastructures.
-
-**Description:** This module will enable for outputting various internal
-information that cloud-init sources provide to either a file or to the output
-console/log location that this cloud-init has been configured with when
-running.
-
-It can be configured with the following option structure::
-
-    debug:
-       verbose: (defaulting to true)
-       output: (location to write output, defaulting to console + log)
-
-.. note::
-
-    Log configurations are not output.
-"""
-
-import copy
-
-from six import StringIO
-
-from cloudinit import type_utils
-from cloudinit import util
-
-SKIP_KEYS = frozenset(['log_cfgs'])
-
-
-def _make_header(text):
-    header = StringIO()
-    header.write("-" * 80)
-    header.write("\n")
-    header.write(text.center(80, ' '))
-    header.write("\n")
-    header.write("-" * 80)
-    header.write("\n")
-    return header.getvalue()
-
-
-def _dumps(obj):
-    text = util.yaml_dumps(obj, explicit_start=False, explicit_end=False)
-    return text.rstrip()
-
-
-def handle(name, cfg, cloud, log, args):
-    """Handler method activated by cloud-init."""
-
-    verbose = util.get_cfg_by_path(cfg, ('debug', 'verbose'), default=True)
-    if args:
-        # if args are provided (from cmdline) then explicitly set verbose
-        out_file = args[0]
-        verbose = True
-    else:
-        out_file = util.get_cfg_by_path(cfg, ('debug', 'output'))
-
-    if not verbose:
-        log.debug(("Skipping module named %s,"
-                   " verbose printing disabled"), name)
-        return
-    # Clean out some keys that we just don't care about showing...
-    dump_cfg = copy.deepcopy(cfg)
-    for k in SKIP_KEYS:
-        dump_cfg.pop(k, None)
-    all_keys = list(dump_cfg)
-    for k in all_keys:
-        if k.startswith("_"):
-            dump_cfg.pop(k, None)
-    # Now dump it...
-    to_print = StringIO()
-    to_print.write(_make_header("Config"))
-    to_print.write(_dumps(dump_cfg))
-    to_print.write("\n")
-    to_print.write(_make_header("MetaData"))
-    to_print.write(_dumps(cloud.datasource.metadata))
-    to_print.write("\n")
-    to_print.write(_make_header("Misc"))
-    to_print.write("Datasource: %s\n" %
-                   (type_utils.obj_name(cloud.datasource)))
-    to_print.write("Distro: %s\n" % (type_utils.obj_name(cloud.distro)))
-    to_print.write("Hostname: %s\n" % (cloud.get_hostname(True)))
-    to_print.write("Instance ID: %s\n" % (cloud.get_instance_id()))
-    to_print.write("Locale: %s\n" % (cloud.get_locale()))
-    to_print.write("Launch IDX: %s\n" % (cloud.launch_index))
-    contents = to_print.getvalue()
-    content_to_file = []
-    for line in contents.splitlines():
-        line = "ci-info: %s\n" % (line)
-        content_to_file.append(line)
-    if out_file:
-        util.write_file(out_file, "".join(content_to_file), 0o644, "w")
-    else:
-        util.multi_log("".join(content_to_file), console=True, stderr=False)

=== removed file 'cloudinit/config/cc_disable_ec2_metadata.py'
--- cloudinit/config/cc_disable_ec2_metadata.py	2012-06-23 04:02:04 +0000
+++ cloudinit/config/cc_disable_ec2_metadata.py	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-# vi: ts=4 expandtab
-#
-#    Copyright (C) 2009-2010 Canonical Ltd.
-#    Copyright (C) 2012 Hewlett-Packard Development Company, L.P.
-#
-#    Author: Scott Moser <[e-mail]>
-#    Author: Juerg Haefliger <[e-mail]>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License version 3, as
-#    published by the Free Software Foundation.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-from cloudinit import util
-
-from cloudinit.settings import PER_ALWAYS
-
-frequency = PER_ALWAYS
-
-REJECT_CMD = ['route', 'add', '-host', '169.254.169.254', 'reject']
-
-
-def handle(name, cfg, _cloud, log, _args):
-    disabled = util.get_cfg_option_bool(cfg, "disable_ec2_metadata", False)
-    if disabled:
-        util.subp(REJECT_CMD, capture=False)
-    else:
-        log.debug(("Skipping module named %s,"
-                   " disabling the ec2 route not enabled"), name)

=== renamed file 'cloudinit/config/cc_disk_setup.py' => 'cloudinit/config/cc_disk_setup.py.THIS'
=== removed file 'cloudinit/config/cc_emit_upstart.py'
--- cloudinit/config/cc_emit_upstart.py	2016-05-12 17:56:26 +0000
+++ cloudinit/config/cc_emit_upstart.py	1970-01-01 00:00:00 +0000
@@ -1,69 +0,0 @@
-# vi: ts=4 expandtab
-#
-#    Copyright (C) 2009-2011 Canonical Ltd.
-#    Copyright (C) 2012 Hewlett-Packard Development Company, L.P.
-#
-#    Author: Scott Moser <[e-mail]>
-#    Author: Juerg Haefliger <[e-mail]>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License version 3, as
-#    published by the Free Software Foundation.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import os
-
-from cloudinit import log as logging
-from cloudinit.settings import PER_ALWAYS
-from cloudinit import util
-
-frequency = PER_ALWAYS
-
-distros = ['ubuntu', 'debian']
-LOG = logging.getLogger(__name__)
-
-
-def is_upstart_system():
-    if not os.path.isfile("/sbin/initctl"):
-        LOG.debug("no /sbin/initctl located")
-        return False
-
-    myenv = os.environ.copy()
-    if 'UPSTART_SESSION' in myenv:
-        del myenv['UPSTART_SESSION']
-    check_cmd = ['initctl', 'version']
-    try:
-        (out, err) = util.subp(check_cmd, env=myenv)
-        return 'upstart' in out
-    except util.ProcessExecutionError as e:
-        LOG.debug("'%s' returned '%s', not using upstart",
-                  ' '.join(check_cmd), e.exit_code)
-    return False
-
-
-def handle(name, _cfg, cloud, log, args):
-    event_names = args
-    if not event_names:
-        # Default to the 'cloud-config'
-        # event for backwards compat.
-        event_names = ['cloud-config']
-
-    if not is_upstart_system():
-        log.debug("not upstart system, '%s' disabled")
-        return
-
-    cfgpath = cloud.paths.get_ipath_cur("cloud_config")
-    for n in event_names:
-        cmd = ['initctl', 'emit', str(n), 'CLOUD_CFG=%s' % cfgpath]
-        try:
-            util.subp(cmd)
-        except Exception as e:
-            # TODO(harlowja), use log exception from utils??
-            log.warn("Emission of upstart event %s failed due to: %s", n, e)

=== removed file 'cloudinit/config/cc_fan.py'
--- cloudinit/config/cc_fan.py	2016-05-12 17:56:26 +0000
+++ cloudinit/config/cc_fan.py	1970-01-01 00:00:00 +0000
@@ -1,101 +0,0 @@
-# vi: ts=4 expandtab
-#
-#    Copyright (C) 2015 Canonical Ltd.
-#
-#    Author: Scott Moser <[e-mail]>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License version 3, as
-#    published by the Free Software Foundation.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-"""
-fan module allows configuration of Ubuntu Fan
-  https://wiki.ubuntu.com/FanNetworking
-
-Example config:
-  #cloud-config
-  fan:
-    config: |
-      # fan 240
-      10.0.0.0/8 eth0/16 dhcp
-      10.0.0.0/8 eth1/16 dhcp off
-      # fan 241
-      241.0.0.0/8 eth0/16 dhcp
-    config_path: /etc/network/fan
-
-If cloud-init sees a 'fan' entry in cloud-config it will
- a.) write 'config_path' with the contents
- b.) install the package 'ubuntu-fan' if it is not installed
- c.) ensure the service is started (or restarted if was previously running)
-"""
-
-from cloudinit import log as logging
-from cloudinit.settings import PER_INSTANCE
-from cloudinit import util
-
-LOG = logging.getLogger(__name__)
-
-frequency = PER_INSTANCE
-
-BUILTIN_CFG = {
-    'config': None,
-    'config_path': '/etc/network/fan',
-}
-
-
-def stop_update_start(service, config_file, content, systemd=False):
-    if systemd:
-        cmds = {'stop': ['systemctl', 'stop', service],
-                'start': ['systemctl', 'start', service],
-                'enable': ['systemctl', 'enable', service]}
-    else:
-        cmds = {'stop': ['service', 'stop'],
-                'start': ['service', 'start']}
-
-    def run(cmd, msg):
-        try:
-            return util.subp(cmd, capture=True)
-        except util.ProcessExecutionError as e:
-            LOG.warn("failed: %s (%s): %s", service, cmd, e)
-            return False
-
-    stop_failed = not run(cmds['stop'], msg='stop %s' % service)
-    if not content.endswith('\n'):
-        content += '\n'
-    util.write_file(config_file, content, omode="w")
-
-    ret = run(cmds['start'], msg='start %s' % service)
-    if ret and stop_failed:
-        LOG.warn("success: %s started", service)
-
-    if 'enable' in cmds:
-        ret = run(cmds['enable'], msg='enable %s' % service)
-
-    return ret
-
-
-def handle(name, cfg, cloud, log, args):
-    cfgin = cfg.get('fan')
-    if not cfgin:
-        cfgin = {}
-    mycfg = util.mergemanydict([cfgin, BUILTIN_CFG])
-
-    if not mycfg.get('config'):
-        LOG.debug("%s: no 'fan' config entry. disabling", name)
-        return
-
-    util.write_file(mycfg.get('config_path'), mycfg.get('config'), omode="w")
-    distro = cloud.distro
-    if not util.which('fanctl'):
-        distro.install_packages(['ubuntu-fan'])
-
-    stop_update_start(
-        service='ubuntu-fan', config_file=mycfg.get('config_path'),
-        content=mycfg.get('config'), systemd=distro.uses_systemd())

=== removed file 'cloudinit/config/cc_final_message.py'
--- cloudinit/config/cc_final_message.py	2016-05-12 17:56:26 +0000
+++ cloudinit/config/cc_final_message.py	1970-01-01 00:00:00 +0000
@@ -1,73 +0,0 @@
-# vi: ts=4 expandtab
-#
-#    Copyright (C) 2011 Canonical Ltd.
-#    Copyright (C) 2012 Hewlett-Packard Development Company, L.P.
-#
-#    Author: Scott Moser <[e-mail]>
-#    Author: Juerg Haefliger <[e-mail]>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License version 3, as
-#    published by the Free Software Foundation.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-from cloudinit import templater
-from cloudinit import util
-from cloudinit import version
-
-from cloudinit.settings import PER_ALWAYS
-
-frequency = PER_ALWAYS
-
-# Jinja formated default message
-FINAL_MESSAGE_DEF = (
-    "## template: jinja\n"
-    "Cloud-init v. {{version}} finished at {{timestamp}}."
-    " Datasource {{datasource}}.  Up {{uptime}} seconds"
-)
-
-
-def handle(_name, cfg, cloud, log, args):
-
-    msg_in = ''
-    if len(args) != 0:
-        msg_in = str(args[0])
-    else:
-        msg_in = util.get_cfg_option_str(cfg, "final_message", "")
-
-    msg_in = msg_in.strip()
-    if not msg_in:
-        msg_in = FINAL_MESSAGE_DEF
-
-    uptime = util.uptime()
-    ts = util.time_rfc2822()
-    cver = version.version_string()
-    try:
-        subs = {
-            'uptime': uptime,
-            'timestamp': ts,
-            'version': cver,
-            'datasource': str(cloud.datasource),
-        }
-        subs.update(dict([(k.upper(), v) for k, v in subs.items()]))
-        util.multi_log("%s\n" % (templater.render_string(msg_in, subs)),
-                       console=False, stderr=True, log=log)
-    except Exception:
-        util.logexc(log, "Failed to render final message template")
-
-    boot_fin_fn = cloud.paths.boot_finished
-    try:
-        contents = "%s - %s - v. %s\n" % (uptime, ts, cver)
-        util.write_file(boot_fin_fn, contents)
-    except Exception:
-        util.logexc(log, "Failed to write boot finished file %s", boot_fin_fn)
-
-    if cloud.datasource.is_disconnected:
-        log.warn("Used fallback datasource")

=== removed file 'cloudinit/config/cc_foo.py'
--- cloudinit/config/cc_foo.py	2012-06-21 16:12:16 +0000
+++ cloudinit/config/cc_foo.py	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-# vi: ts=4 expandtab
-#
-#    Copyright (C) 2009-2010 Canonical Ltd.
-#    Copyright (C) 2012 Hewlett-Packard Development Company, L.P.
-#
-#    Author: Scott Moser <[e-mail]>
-#    Author: Juerg Haefliger <[e-mail]>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License version 3, as
-#    published by the Free Software Foundation.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-from cloudinit.settings import PER_INSTANCE
-
-# Modules are expected to have the following attributes.
-# 1. A required 'handle' method which takes the following params.
-#    a) The name will not be this files name, but instead
-#    the name specified in configuration (which is the name
-#    which will be used to find this module).
-#    b) A configuration object that is the result of the merging
-#    of cloud configs configuration with legacy configuration
-#    as well as any datasource provided configuration
-#    c) A cloud object that can be used to access various
-#    datasource and paths for the given distro and data provided
-#    by the various datasource instance types.
-#    d) A argument list that may or may not be empty to this module.
-#    Typically those are from module configuration where the module
-#    is defined with some extra configuration that will eventually
-#    be translated from yaml into arguments to this module.
-# 2. A optional 'frequency' that defines how often this module should be ran.
-#    Typically one of PER_INSTANCE, PER_ALWAYS, PER_ONCE. If not
-#    provided PER_INSTANCE will be assumed.
-#    See settings.py for these constants.
-# 3. A optional 'distros' array/set/tuple that defines the known distros
-#    this module will work with (if not all of them). This is used to write
-#    a warning out if a module is being ran on a untested distribution for
-#    informational purposes. If non existent all distros are assumed and
-#    no warning occurs.
-
-frequency = PER_INSTANCE
-
-
-def handle(name, _cfg, _cloud, log, _args):
-    log.debug("Hi from module %s", name)

=== removed file 'cloudinit/config/cc_growpart.py'
--- cloudinit/config/cc_growpart.py	2015-06-16 15:18:33 +0000
+++ cloudinit/config/cc_growpart.py	1970-01-01 00:00:00 +0000
@@ -1,300 +0,0 @@
-# vi: ts=4 expandtab
-#
-#    Copyright (C) 2011 Canonical Ltd.
-#    Copyright (C) 2013 Hewlett-Packard Development Company, L.P.
-#
-#    Author: Scott Moser <[e-mail]>
-#    Author: Juerg Haefliger <[e-mail]>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License version 3, as
-#    published by the Free Software Foundation.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import os
-import os.path
-import re
-import stat
-
-from cloudinit import log as logging
-from cloudinit.settings import PER_ALWAYS
-from cloudinit import util
-
-frequency = PER_ALWAYS
-
-DEFAULT_CONFIG = {
-    'mode': 'auto',
-    'devices': ['/'],
-    'ignore_growroot_disabled': False,
-}
-
-
-def enum(**enums):
-    return type('Enum', (), enums)
-
-
-RESIZE = enum(SKIPPED="SKIPPED", CHANGED="CHANGED", NOCHANGE="NOCHANGE",
-              FAILED="FAILED")
-
-LOG = logging.getLogger(__name__)
-
-
-def resizer_factory(mode):
-    resize_class = None
-    if mode == "auto":
-        for (_name, resizer) in RESIZERS:
-            cur = resizer()
-            if cur.available():
-                resize_class = cur
-                break
-
-        if not resize_class:
-            raise ValueError("No resizers available")
-
-    else:
-        mmap = {}
-        for (k, v) in RESIZERS:
-            mmap[k] = v
-
-        if mode not in mmap:
-            raise TypeError("unknown resize mode %s" % mode)
-
-        mclass = mmap[mode]()
-        if mclass.available():
-            resize_class = mclass
-
-        if not resize_class:
-            raise ValueError("mode %s not available" % mode)
-
-    return resize_class
-
-
-class ResizeFailedException(Exception):
-    pass
-
-
-class ResizeGrowPart(object):
-    def available(self):
-        myenv = os.environ.copy()
-        myenv['LANG'] = 'C'
-
-        try:
-            (out, _err) = util.subp(["growpart", "--help"], env=myenv)
-            if re.search(r"--update\s+", out, re.DOTALL):
-                return True
-
-        except util.ProcessExecutionError:
-            pass
-        return False
-
-    def resize(self, diskdev, partnum, partdev):
-        before = get_size(partdev)
-        try:
-            util.subp(["growpart", '--dry-run', diskdev, partnum])
-        except util.ProcessExecutionError as e:
-            if e.exit_code != 1:
-                util.logexc(LOG, "Failed growpart --dry-run for (%s, %s)",
-                            diskdev, partnum)
-                raise ResizeFailedException(e)
-            return (before, before)
-
-        try:
-            util.subp(["growpart", diskdev, partnum])
-        except util.ProcessExecutionError as e:
-            util.logexc(LOG, "Failed: growpart %s %s", diskdev, partnum)
-            raise ResizeFailedException(e)
-
-        return (before, get_size(partdev))
-
-
-class ResizeGpart(object):
-    def available(self):
-        if not util.which('gpart'):
-            return False
-        return True
-
-    def resize(self, diskdev, partnum, partdev):
-        """
-        GPT disks store metadata at the beginning (primary) and at the
-        end (secondary) of the disk. When launching an image with a
-        larger disk compared to the original image, the secondary copy
-        is lost. Thus, the metadata will be marked CORRUPT, and need to
-        be recovered.
-        """
-        try:
-            util.subp(["gpart", "recover", diskdev])
-        except util.ProcessExecutionError as e:
-            if e.exit_code != 0:
-                util.logexc(LOG, "Failed: gpart recover %s", diskdev)
-                raise ResizeFailedException(e)
-
-        before = get_size(partdev)
-        try:
-            util.subp(["gpart", "resize", "-i", partnum, diskdev])
-        except util.ProcessExecutionError as e:
-            util.logexc(LOG, "Failed: gpart resize -i %s %s", partnum, diskdev)
-            raise ResizeFailedException(e)
-
-        # Since growing the FS requires a reboot, make sure we reboot
-        # first when this module has finished.
-        open('/var/run/reboot-required', 'a').close()
-
-        return (before, get_size(partdev))
-
-
-def get_size(filename):
-    fd = os.open(filename, os.O_RDONLY)
-    try:
-        return os.lseek(fd, 0, os.SEEK_END)
-    finally:
-        os.close(fd)
-
-
-def device_part_info(devpath):
-    # convert an entry in /dev/ to parent disk and partition number
-
-    # input of /dev/vdb or /dev/disk/by-label/foo
-    # rpath is hopefully a real-ish path in /dev (vda, sdb..)
-    rpath = os.path.realpath(devpath)
-
-    bname = os.path.basename(rpath)
-    syspath = "/sys/class/block/%s" % bname
-
-    # FreeBSD doesn't know of sysfs so just get everything we need from
-    # the device, like /dev/vtbd0p2.
-    if util.system_info()["platform"].startswith('FreeBSD'):
-        m = re.search('^(/dev/.+)p([0-9])$', devpath)
-        return (m.group(1), m.group(2))
-
-    if not os.path.exists(syspath):
-        raise ValueError("%s had no syspath (%s)" % (devpath, syspath))
-
-    ptpath = os.path.join(syspath, "partition")
-    if not os.path.exists(ptpath):
-        raise TypeError("%s not a partition" % devpath)
-
-    ptnum = util.load_file(ptpath).rstrip()
-
-    # for a partition, real syspath is something like:
-    # /sys/devices/pci0000:00/0000:00:04.0/virtio1/block/vda/vda1
-    rsyspath = os.path.realpath(syspath)
-    disksyspath = os.path.dirname(rsyspath)
-
-    diskmajmin = util.load_file(os.path.join(disksyspath, "dev")).rstrip()
-    diskdevpath = os.path.realpath("/dev/block/%s" % diskmajmin)
-
-    # diskdevpath has something like 253:0
-    # and udev has put links in /dev/block/253:0 to the device name in /dev/
-    return (diskdevpath, ptnum)
-
-
-def devent2dev(devent):
-    if devent.startswith("/dev/"):
-        return devent
-    else:
-        result = util.get_mount_info(devent)
-        if not result:
-            raise ValueError("Could not determine device of '%s' % dev_ent")
-        return result[0]
-
-
-def resize_devices(resizer, devices):
-    # returns a tuple of tuples containing (entry-in-devices, action, message)
-    info = []
-    for devent in devices:
-        try:
-            blockdev = devent2dev(devent)
-        except ValueError as e:
-            info.append((devent, RESIZE.SKIPPED,
-                         "unable to convert to device: %s" % e,))
-            continue
-
-        try:
-            statret = os.stat(blockdev)
-        except OSError as e:
-            info.append((devent, RESIZE.SKIPPED,
-                         "stat of '%s' failed: %s" % (blockdev, e),))
-            continue
-
-        if (not stat.S_ISBLK(statret.st_mode) and
-                not stat.S_ISCHR(statret.st_mode)):
-            info.append((devent, RESIZE.SKIPPED,
-                         "device '%s' not a block device" % blockdev,))
-            continue
-
-        try:
-            (disk, ptnum) = device_part_info(blockdev)
-        except (TypeError, ValueError) as e:
-            info.append((devent, RESIZE.SKIPPED,
-                         "device_part_info(%s) failed: %s" % (blockdev, e),))
-            continue
-
-        try:
-            (old, new) = resizer.resize(disk, ptnum, blockdev)
-            if old == new:
-                info.append((devent, RESIZE.NOCHANGE,
-                             "no change necessary (%s, %s)" % (disk, ptnum),))
-            else:
-                info.append((devent, RESIZE.CHANGED,
-                             "changed (%s, %s) from %s to %s" %
-                             (disk, ptnum, old, new),))
-
-        except ResizeFailedException as e:
-            info.append((devent, RESIZE.FAILED,
-                         "failed to resize: disk=%s, ptnum=%s: %s" %
-                         (disk, ptnum, e),))
-
-    return info
-
-
-def handle(_name, cfg, _cloud, log, _args):
-    if 'growpart' not in cfg:
-        log.debug("No 'growpart' entry in cfg.  Using default: %s" %
-                  DEFAULT_CONFIG)
-        cfg['growpart'] = DEFAULT_CONFIG
-
-    mycfg = cfg.get('growpart')
-    if not isinstance(mycfg, dict):
-        log.warn("'growpart' in config was not a dict")
-        return
-
-    mode = mycfg.get('mode', "auto")
-    if util.is_false(mode):
-        log.debug("growpart disabled: mode=%s" % mode)
-        return
-
-    if util.is_false(mycfg.get('ignore_growroot_disabled', False)):
-        if os.path.isfile("/etc/growroot-disabled"):
-            log.debug("growpart disabled: /etc/growroot-disabled exists")
-            log.debug("use ignore_growroot_disabled to ignore")
-            return
-
-    devices = util.get_cfg_option_list(mycfg, "devices", ["/"])
-    if not len(devices):
-        log.debug("growpart: empty device list")
-        return
-
-    try:
-        resizer = resizer_factory(mode)
-    except (ValueError, TypeError) as e:
-        log.debug("growpart unable to find resizer for '%s': %s" % (mode, e))
-        if mode != "auto":
-            raise e
-        return
-
-    resized = util.log_time(logfunc=log.debug, msg="resize_devices",
-                            func=resize_devices, args=(resizer, devices))
-    for (entry, action, msg) in resized:
-        if action == RESIZE.CHANGED:
-            log.info("'%s' resized: %s" % (entry, msg))
-        else:
-            log.debug("'%s' %s: %s" % (entry, action, msg))
-
-RESIZERS = (('growpart', ResizeGrowPart), ('gpart', ResizeGpart))

=== removed file 'cloudinit/config/cc_grub_dpkg.py'
--- cloudinit/config/cc_grub_dpkg.py	2016-05-12 17:56:26 +0000
+++ cloudinit/config/cc_grub_dpkg.py	1970-01-01 00:00:00 +0000
@@ -1,73 +0,0 @@
-# vi: ts=4 expandtab
-#
-#    Copyright (C) 2009-2010 Canonical Ltd.
-#    Copyright (C) 2012 Hewlett-Packard Development Company, L.P.
-#
-#    Author: Scott Moser <[e-mail]>
-#    Author: Juerg Haefliger <[e-mail]>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License version 3, as
-#    published by the Free Software Foundation.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import os
-
-from cloudinit import util
-
-distros = ['ubuntu', 'debian']
-
-
-def handle(name, cfg, _cloud, log, _args):
-
-    mycfg = cfg.get("grub_dpkg", cfg.get("grub-dpkg", {}))
-    if not mycfg:
-        mycfg = {}
-
-    enabled = mycfg.get('enabled', True)
-    if util.is_false(enabled):
-        log.debug("%s disabled by config grub_dpkg/enabled=%s", name, enabled)
-        return
-
-    idevs = util.get_cfg_option_str(mycfg, "grub-pc/install_devices", None)
-    idevs_empty = util.get_cfg_option_str(
-        mycfg, "grub-pc/install_devices_empty", None)
-
-    if ((os.path.exists("/dev/sda1") and not os.path.exists("/dev/sda")) or
-       (os.path.exists("/dev/xvda1") and not os.path.exists("/dev/xvda"))):
-        if idevs is None:
-            idevs = ""
-        if idevs_empty is None:
-            idevs_empty = "true"
-    else:
-        if idevs_empty is None:
-            idevs_empty = "false"
-        if idevs is None:
-            idevs = "/dev/sda"
-            for dev in ("/dev/sda", "/dev/vda", "/dev/xvda",
-                        "/dev/sda1", "/dev/vda1", "/dev/xvda1"):
-                if os.path.exists(dev):
-                    idevs = dev
-                    break
-
-    # now idevs and idevs_empty are set to determined values
-    # or, those set by user
-
-    dconf_sel = (("grub-pc grub-pc/install_devices string %s\n"
-                 "grub-pc grub-pc/install_devices_empty boolean %s\n") %
-                 (idevs, idevs_empty))
-
-    log.debug("Setting grub debconf-set-selections with '%s','%s'" %
-              (idevs, idevs_empty))
-
-    try:
-        util.subp(['debconf-set-selections'], dconf_sel)
-    except Exception:
-        util.logexc(log, "Failed to run debconf-set-selections for grub-dpkg")

=== removed file 'cloudinit/config/cc_keys_to_console.py'
--- cloudinit/config/cc_keys_to_console.py	2016-05-12 17:56:26 +0000
+++ cloudinit/config/cc_keys_to_console.py	1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
-# vi: ts=4 expandtab
-#
-#    Copyright (C) 2011 Canonical Ltd.
-#    Copyright (C) 2012 Hewlett-Packard Development Company, L.P.
-#
-#    Author: Scott Moser <[e-mail]>
-#    Author: Juerg Haefliger <[e-mail]>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License version 3, as
-#    published by the Free Software Foundation.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import os
-
-from cloudinit.settings import PER_INSTANCE
-from cloudinit import util
-
-frequency = PER_INSTANCE
-
-# This is a tool that cloud init provides
-HELPER_TOOL_TPL = '%s/cloud-init/write-ssh-key-fingerprints'
-
-
-def _get_helper_tool_path(distro):
-    try:
-        base_lib = distro.usr_lib_exec
-    except AttributeError:
-        base_lib = '/usr/lib'
-    return HELPER_TOOL_TPL % base_lib
-
-
-def handle(name, cfg, cloud, log, _args):
-    helper_path = _get_helper_tool_path(cloud.distro)
-    if not os.path.exists(helper_path):
-        log.warn(("Unable to activate module %s,"
-                  " helper tool not found at %s"), name, helper_path)
-        return
-
-    fp_blacklist = util.get_cfg_option_list(cfg,
-                                            "ssh_fp_console_blacklist", [])
-    key_blacklist = util.get_cfg_option_list(cfg,
-                                             "ssh_key_console_blacklist",
-                                             ["ssh-dss"])
-
-    try:
-        cmd = [helper_path]
-        cmd.append(','.join(fp_blacklist))
-        cmd.append(','.join(key_blacklist))
-        (stdout, _stderr) = util.subp(cmd)
-        util.multi_log("%s\n" % (stdout.strip()),
-                       stderr=False, console=True)
-    except Exception:
-        log.warn("Writing keys to the system console failed!")
-        raise

=== removed file 'cloudinit/config/cc_landscape.py'
--- cloudinit/config/cc_landscape.py	2016-03-04 06:45:58 +0000
+++ cloudinit/config/cc_landscape.py	1970-01-01 00:00:00 +0000
@@ -1,99 +0,0 @@
-# vi: ts=4 expandtab
-#
-#    Copyright (C) 2011 Canonical Ltd.
-#    Copyright (C) 2012 Hewlett-Packard Development Company, L.P.
-#
-#    Author: Scott Moser <[e-mail]>
-#    Author: Juerg Haefliger <[e-mail]>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License version 3, as
-#    published by the Free Software Foundation.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import os
-
-from six import StringIO
-
-from configobj import ConfigObj
-
-from cloudinit import type_utils
-from cloudinit import util
-
-from cloudinit.settings import PER_INSTANCE
-
-frequency = PER_INSTANCE
-
-LSC_CLIENT_CFG_FILE = "/etc/landscape/client.conf"
-LS_DEFAULT_FILE = "/etc/default/landscape-client"
-
-distros = ['ubuntu']
-
-# defaults taken from stock client.conf in landscape-client 11.07.1.1-0ubuntu2
-LSC_BUILTIN_CFG = {
-    'client': {
-        'log_level': "info",
-        'url': "https://landscape.canonical.com/message-system",
-        'ping_url': "http://landscape.canonical.com/ping",
-        'data_path': "/var/lib/landscape/client",
-    }
-}
-
-
-def handle(_name, cfg, cloud, log, _args):
-    """
-    Basically turn a top level 'landscape' entry with a 'client' dict
-    and render it to ConfigObj format under '[client]' section in
-    /etc/landscape/client.conf
-    """
-
-    ls_cloudcfg = cfg.get("landscape", {})
-
-    if not isinstance(ls_cloudcfg, (dict)):
-        raise RuntimeError(("'landscape' key existed in config,"
-                            " but not a dictionary type,"
-                            " is a %s instead"),
-                           type_utils.obj_name(ls_cloudcfg))
-    if not ls_cloudcfg:
-        return
-
-    cloud.distro.install_packages(('landscape-client',))
-
-    merge_data = [
-        LSC_BUILTIN_CFG,
-        LSC_CLIENT_CFG_FILE,
-        ls_cloudcfg,
-    ]
-    merged = merge_together(merge_data)
-    contents = StringIO()
-    merged.write(contents)
-
-    util.ensure_dir(os.path.dirname(LSC_CLIENT_CFG_FILE))
-    util.write_file(LSC_CLIENT_CFG_FILE, contents.getvalue())
-    log.debug("Wrote landscape config file to %s", LSC_CLIENT_CFG_FILE)
-
-    util.write_file(LS_DEFAULT_FILE, "RUN=1\n")
-    util.subp(["service", "landscape-client", "restart"])
-
-
-def merge_together(objs):
-    """
-    merge together ConfigObj objects or things that ConfigObj() will take in
-    later entries override earlier
-    """
-    cfg = ConfigObj({})
-    for obj in objs:
-        if not obj:
-            continue
-        if isinstance(obj, ConfigObj):
-            cfg.merge(obj)
-        else:
-            cfg.merge(ConfigObj(obj))
-    return cfg

=== removed file 'cloudinit/config/cc_locale.py'
--- cloudinit/config/cc_locale.py	2015-03-04 19:49:44 +0000
+++ cloudinit/config/cc_locale.py	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-# vi: ts=4 expandtab
-#
-#    Copyright (C) 2011 Canonical Ltd.
-#    Copyright (C) 2012 Hewlett-Packard Development Company, L.P.
-#
-#    Author: Scott Moser <[e-mail]>
-#    Author: Juerg Haefliger <[e-mail]>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License version 3, as
-#    published by the Free Software Foundation.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-from cloudinit import util
-
-
-def handle(name, cfg, cloud, log, args):
-    if len(args) != 0:
-        locale = args[0]
-    else:
-        locale = util.get_cfg_option_str(cfg, "locale", cloud.get_locale())
-
-    if util.is_false(locale):
-        log.debug("Skipping module named %s, disabled by config: %s",
-                  name, locale)
-        return
-
-    log.debug("Setting locale to %s", locale)
-    locale_cfgfile = util.get_cfg_option_str(cfg, "locale_configfile")
-    cloud.distro.apply_locale(locale, locale_cfgfile)

=== removed file 'cloudinit/config/cc_lxd.py'
--- cloudinit/config/cc_lxd.py	2016-05-12 17:56:26 +0000
+++ cloudinit/config/cc_lxd.py	1970-01-01 00:00:00 +0000
@@ -1,176 +0,0 @@
-# vi: ts=4 expandtab
-#
-#    Copyright (C) 2016 Canonical Ltd.
-#
-#    Author: Wesley Wiedenmeier <[e-mail]>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License version 3, as
-#    published by the Free Software Foundation.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-"""
-This module initializes lxd using 'lxd init'
-
-Example config:
-  #cloud-config
-  lxd:
-    init:
-      network_address: <ip addr>
-      network_port: <port>
-      storage_backend: <zfs/dir>
-      storage_create_device: <dev>
-      storage_create_loop: <size>
-      storage_pool: <name>
-      trust_password: <password>
-    bridge:
-      mode: <new, existing or none>
-      name: <name>
-      ipv4_address: <ip addr>
-      ipv4_netmask: <cidr>
-      ipv4_dhcp_first: <ip addr>
-      ipv4_dhcp_last: <ip addr>
-      ipv4_dhcp_leases: <size>
-      ipv4_nat: <bool>
-      ipv6_address: <ip addr>
-      ipv6_netmask: <cidr>
-      ipv6_nat: <bool>
-      domain: <domain>
-"""
-
-from cloudinit import util
-
-
-def handle(name, cfg, cloud, log, args):
-    # Get config
-    lxd_cfg = cfg.get('lxd')
-    if not lxd_cfg:
-        log.debug("Skipping module named %s, not present or disabled by cfg")
-        return
-    if not isinstance(lxd_cfg, dict):
-        log.warn("lxd config must be a dictionary. found a '%s'",
-                 type(lxd_cfg))
-        return
-
-    # Grab the configuration
-    init_cfg = lxd_cfg.get('init')
-    if not isinstance(init_cfg, dict):
-        log.warn("lxd/init config must be a dictionary. found a '%s'",
-                 type(init_cfg))
-        init_cfg = {}
-
-    bridge_cfg = lxd_cfg.get('bridge')
-    if not isinstance(bridge_cfg, dict):
-        log.warn("lxd/bridge config must be a dictionary. found a '%s'",
-                 type(bridge_cfg))
-        bridge_cfg = {}
-
-    # Install the needed packages
-    packages = []
-    if not util.which("lxd"):
-        packages.append('lxd')
-
-    if init_cfg.get("storage_backend") == "zfs" and not util.which('zfs'):
-        packages.append('zfs')
-
-    if len(packages):
-        try:
-            cloud.distro.install_packages(packages)
-        except util.ProcessExecutionError as exc:
-            log.warn("failed to install packages %s: %s", packages, exc)
-            return
-
-    # Set up lxd if init config is given
-    if init_cfg:
-        init_keys = (
-            'network_address', 'network_port', 'storage_backend',
-            'storage_create_device', 'storage_create_loop',
-            'storage_pool', 'trust_password')
-        cmd = ['lxd', 'init', '--auto']
-        for k in init_keys:
-            if init_cfg.get(k):
-                cmd.extend(["--%s=%s" %
-                            (k.replace('_', '-'), str(init_cfg[k]))])
-        util.subp(cmd)
-
-    # Set up lxd-bridge if bridge config is given
-    dconf_comm = "debconf-communicate"
-    if bridge_cfg and util.which(dconf_comm):
-        debconf = bridge_to_debconf(bridge_cfg)
-
-        # Update debconf database
-        try:
-            log.debug("Setting lxd debconf via " + dconf_comm)
-            data = "\n".join(["set %s %s" % (k, v)
-                              for k, v in debconf.items()]) + "\n"
-            util.subp(['debconf-communicate'], data)
-        except Exception:
-            util.logexc(log, "Failed to run '%s' for lxd with" % dconf_comm)
-
-        # Remove the existing configuration file (forces re-generation)
-        util.del_file("/etc/default/lxd-bridge")
-
-        # Run reconfigure
-        log.debug("Running dpkg-reconfigure for lxd")
-        util.subp(['dpkg-reconfigure', 'lxd',
-                   '--frontend=noninteractive'])
-    elif bridge_cfg:
-        raise RuntimeError(
-            "Unable to configure lxd bridge without %s." + dconf_comm)
-
-
-def bridge_to_debconf(bridge_cfg):
-    debconf = {}
-
-    if bridge_cfg.get("mode") == "none":
-        debconf["lxd/setup-bridge"] = "false"
-        debconf["lxd/bridge-name"] = ""
-
-    elif bridge_cfg.get("mode") == "existing":
-        debconf["lxd/setup-bridge"] = "false"
-        debconf["lxd/use-existing-bridge"] = "true"
-        debconf["lxd/bridge-name"] = bridge_cfg.get("name")
-
-    elif bridge_cfg.get("mode") == "new":
-        debconf["lxd/setup-bridge"] = "true"
-        if bridge_cfg.get("name"):
-            debconf["lxd/bridge-name"] = bridge_cfg.get("name")
-
-        if bridge_cfg.get("ipv4_address"):
-            debconf["lxd/bridge-ipv4"] = "true"
-            debconf["lxd/bridge-ipv4-address"] = \
-                bridge_cfg.get("ipv4_address")
-            debconf["lxd/bridge-ipv4-netmask"] = \
-                bridge_cfg.get("ipv4_netmask")
-            debconf["lxd/bridge-ipv4-dhcp-first"] = \
-                bridge_cfg.get("ipv4_dhcp_first")
-            debconf["lxd/bridge-ipv4-dhcp-last"] = \
-                bridge_cfg.get("ipv4_dhcp_last")
-            debconf["lxd/bridge-ipv4-dhcp-leases"] = \
-                bridge_cfg.get("ipv4_dhcp_leases")
-            debconf["lxd/bridge-ipv4-nat"] = \
-                bridge_cfg.get("ipv4_nat", "true")
-
-        if bridge_cfg.get("ipv6_address"):
-            debconf["lxd/bridge-ipv6"] = "true"
-            debconf["lxd/bridge-ipv6-address"] = \
-                bridge_cfg.get("ipv6_address")
-            debconf["lxd/bridge-ipv6-netmask"] = \
-                bridge_cfg.get("ipv6_netmask")
-            debconf["lxd/bridge-ipv6-nat"] = \
-                bridge_cfg.get("ipv6_nat", "false")
-
-        if bridge_cfg.get("domain"):
-            debconf["lxd/bridge-domain"] = bridge_cfg.get("domain")
-
-    else:
-        raise Exception("invalid bridge mode \"%s\"" % bridge_cfg.get("mode"))
-
-    return debconf

=== removed file 'cloudinit/config/cc_mcollective.py'
--- cloudinit/config/cc_mcollective.py	2015-01-21 22:56:53 +0000
+++ cloudinit/config/cc_mcollective.py	1970-01-01 00:00:00 +0000
@@ -1,88 +0,0 @@
-# vi: ts=4 expandtab
-#
-#    Copyright (C) 2009-2011 Canonical Ltd.
-#    Copyright (C) 2012 Hewlett-Packard Development Company, L.P.
-#
-#    Author: Marc Cluet <[e-mail]>
-#    Based on code by Scott Moser <[e-mail]>
-#    Author: Juerg Haefliger <[e-mail]>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License version 3, as
-#    published by the Free Software Foundation.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import six
-from six import StringIO
-
-# Used since this can maintain comments
-# and doesn't need a top level section
-from configobj import ConfigObj
-
-from cloudinit import util
-
-PUBCERT_FILE = "/etc/mcollective/ssl/server-public.pem"
-PRICERT_FILE = "/etc/mcollective/ssl/server-private.pem"
-SERVER_CFG = '/etc/mcollective/server.cfg'
-
-
-def handle(name, cfg, cloud, log, _args):
-
-    # If there isn't a mcollective key in the configuration don't do anything
-    if 'mcollective' not in cfg:
-        log.debug(("Skipping module named %s, "
-                   "no 'mcollective' key in configuration"), name)
-        return
-
-    mcollective_cfg = cfg['mcollective']
-
-    # Start by installing the mcollective package ...
-    cloud.distro.install_packages(("mcollective",))
-
-    # ... and then update the mcollective configuration
-    if 'conf' in mcollective_cfg:
-        # Read server.cfg values from the
-        # original file in order to be able to mix the rest up
-        mcollective_config = ConfigObj(SERVER_CFG)
-        # See: http://tiny.cc/jh9agw
-        for (cfg_name, cfg) in mcollective_cfg['conf'].items():
-            if cfg_name == 'public-cert':
-                util.write_file(PUBCERT_FILE, cfg, mode=0o644)
-                mcollective_config['plugin.ssl_server_public'] = PUBCERT_FILE
-                mcollective_config['securityprovider'] = 'ssl'
-            elif cfg_name == 'private-cert':
-                util.write_file(PRICERT_FILE, cfg, mode=0o600)
-                mcollective_config['plugin.ssl_server_private'] = PRICERT_FILE
-                mcollective_config['securityprovider'] = 'ssl'
-            else:
-                if isinstance(cfg, six.string_types):
-                    # Just set it in the 'main' section
-                    mcollective_config[cfg_name] = cfg
-                elif isinstance(cfg, (dict)):
-                    # Iterate through the config items, create a section
-                    # if it is needed and then add/or create items as needed
-                    if cfg_name not in mcollective_config.sections:
-                        mcollective_config[cfg_name] = {}
-                    for (o, v) in cfg.items():
-                        mcollective_config[cfg_name][o] = v
-                else:
-                    # Otherwise just try to convert it to a string
-                    mcollective_config[cfg_name] = str(cfg)
-        # We got all our config as wanted we'll rename
-        # the previous server.cfg and create our new one
-        util.rename(SERVER_CFG, "%s.old" % (SERVER_CFG))
-        # Now we got the whole file, write to disk...
-        contents = StringIO()
-        mcollective_config.write(contents)
-        contents = contents.getvalue()
-        util.write_file(SERVER_CFG, contents, mode=0o644)
-
-    # Start mcollective
-    util.subp(['service', 'mcollective', 'start'], capture=False)

=== removed file 'cloudinit/config/cc_migrator.py'
--- cloudinit/config/cc_migrator.py	2014-02-05 15:36:47 +0000
+++ cloudinit/config/cc_migrator.py	1970-01-01 00:00:00 +0000
@@ -1,85 +0,0 @@
-# vi: ts=4 expandtab
-#
-#    Copyright (C) 2012 Yahoo! Inc.
-#
-#    Author: Joshua Harlow <[e-mail]>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License version 3, as
-#    published by the Free Software Foundation.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import os
-import shutil
-
-from cloudinit import helpers
-from cloudinit import util
-
-from cloudinit.settings import PER_ALWAYS
-
-frequency = PER_ALWAYS
-
-
-def _migrate_canon_sems(cloud):
-    paths = (cloud.paths.get_ipath('sem'), cloud.paths.get_cpath('sem'))
-    am_adjusted = 0
-    for sem_path in paths:
-        if not sem_path or not os.path.exists(sem_path):
-            continue
-        for p in os.listdir(sem_path):
-            full_path = os.path.join(sem_path, p)
-            if os.path.isfile(full_path):
-                (name, ext) = os.path.splitext(p)
-                canon_name = helpers.canon_sem_name(name)
-                if canon_name != name:
-                    new_path = os.path.join(sem_path, canon_name + ext)
-                    shutil.move(full_path, new_path)
-                    am_adjusted += 1
-    return am_adjusted
-
-
-def _migrate_legacy_sems(cloud, log):
-    legacy_adjust = {
-        'apt-update-upgrade': [
-            'apt-configure',
-            'package-update-upgrade-install',
-        ],
-    }
-    paths = (cloud.paths.get_ipath('sem'), cloud.paths.get_cpath('sem'))
-    for sem_path in paths:
-        if not sem_path or not os.path.exists(sem_path):
-            continue
-        sem_helper = helpers.FileSemaphores(sem_path)
-        for (mod_name, migrate_to) in legacy_adjust.items():
-            possibles = [mod_name, helpers.canon_sem_name(mod_name)]
-            old_exists = []
-            for p in os.listdir(sem_path):
-                (name, _ext) = os.path.splitext(p)
-                if name in possibles and os.path.isfile(p):
-                    old_exists.append(p)
-            for p in old_exists:
-                util.del_file(os.path.join(sem_path, p))
-                (_name, freq) = os.path.splitext(p)
-                for m in migrate_to:
-                    log.debug("Migrating %s => %s with the same frequency",
-                              p, m)
-                    with sem_helper.lock(m, freq):
-                        pass
-
-
-def handle(name, cfg, cloud, log, _args):
-    do_migrate = util.get_cfg_option_str(cfg, "migrate", True)
-    if not util.translate_bool(do_migrate):
-        log.debug("Skipping module named %s, migration disabled", name)
-        return
-    sems_moved = _migrate_canon_sems(cloud)
-    log.debug("Migrated %s semaphore files to there canonicalized names",
-              sems_moved)
-    _migrate_legacy_sems(cloud, log)

=== removed file 'cloudinit/config/cc_mounts.py'
--- cloudinit/config/cc_mounts.py	2016-05-12 17:56:26 +0000
+++ cloudinit/config/cc_mounts.py	1970-01-01 00:00:00 +0000
@@ -1,405 +0,0 @@
-# vi: ts=4 expandtab
-#
-#    Copyright (C) 2009-2010 Canonical Ltd.
-#    Copyright (C) 2012 Hewlett-Packard Development Company, L.P.
-#
-#    Author: Scott Moser <[e-mail]>
-#    Author: Juerg Haefliger <[e-mail]>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License version 3, as
-#    published by the Free Software Foundation.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-from string import whitespace
-
-import logging
-import os.path
-import re
-
-from cloudinit import type_utils
-from cloudinit import util
-
-# Shortname matches 'sda', 'sda1', 'xvda', 'hda', 'sdb', xvdb, vda, vdd1, sr0
-DEVICE_NAME_FILTER = r"^([x]{0,1}[shv]d[a-z][0-9]*|sr[0-9]+)$"
-DEVICE_NAME_RE = re.compile(DEVICE_NAME_FILTER)
-WS = re.compile("[%s]+" % (whitespace))
-FSTAB_PATH = "/etc/fstab"
-
-LOG = logging.getLogger(__name__)
-
-
-def is_meta_device_name(name):
-    # return true if this is a metadata service name
-    if name in ["ami", "root", "swap"]:
-        return True
-    # names 'ephemeral0' or 'ephemeral1'
-    # 'ebs[0-9]' appears when '--block-device-mapping sdf=snap-d4d90bbc'
-    for enumname in ("ephemeral", "ebs"):
-        if name.startswith(enumname) and name.find(":") == -1:
-            return True
-    return False
-
-
-def _get_nth_partition_for_device(device_path, partition_number):
-    potential_suffixes = [str(partition_number), 'p%s' % (partition_number,),
-                          '-part%s' % (partition_number,)]