lp://staging/~oddbloke/cloud-init/lp1403617

Branch merges

Propose for merging

No branches dependent on this one.

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

cloud-init Commiters: Pending requested 2015-04-20

Diff: 191 lines (+95/-46)

2 files modified

cloudinit/sources/DataSourceGCE.py (+50/-42)
tests/unittests/test_datasource/test_gce.py (+45/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1403617: gce datasource does not handle instance ssh keys

Medium

Fix Released

Link a bug report

Related blueprints

1096. By Dan Watkins on 2015-04-20

GCE instance-level SSH keys override project-level keys. (LP: #1403617)

1095. By Dan Watkins on 2015-04-20

Support multiple metadata paths for metadata keys in GCE data source.

1094. By Dan Watkins on 2015-04-20

Rename found variable in GCE data source.

1093. By Dan Watkins on 2015-04-20

Refactor GCE metadata fetching to use a helper class.

1092. By Dan Watkins on 2015-04-20

Add test that missing GCE required key returns False.

1091. By Scott Moser on 2015-04-16

fix cloud-config-archive handling

handling of cloud-config-archive input would fail in fully_decoded_payload.
part.get_charset() would return a Charset object, but
get_charset.input_codec is a string suitable for passing to decode.

This handles that correctly, and is more careful about binary data inside
input.

The test added verifies that cloud-config inside a cloud-config-archive
is handled correctly and also that binary data there is ignored without
exceptions raised.

1090. By Scott Moser on 2015-04-16

pep8 fixes

1089. By Scott Moser on 2015-04-09

systemd: use network-online instead of network.target (LP: #1440180)

don't declare a Wants/Requires on network.target; this is a passive target
that should only be pulled in by implementors of the networking service.
The requirement for network needs to be expressed as a dependency on
network-online.target.

1088. By Scott Moser on 2015-03-31

adjust cc_snappy for snappy install package with config.

It was believed that to install a package with config the command was:
  snappy install --config=config-file <package>
Instead, what was implemented in snappy was:
  snappy install <package> [<config-file>]

This modifies cloud-init to invoke the latter and changes the tests
appropriately.

1087. By Scott Moser on 2015-03-27

fix snappy package installation.

Some tests added here to make sure this works.
The install '--config' will only start to work with the next
version of snappy-go.