lp:~darkmuggle-deactivatedaccount/cloud-init/lp1383794

Branch merges

Propose for merging

No branches dependent on this one.

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

cloud-init Commiters: Pending requested 2015-01-14

Diff: 38 lines (+6/-4)

2 files modified

cloudinit/sources/DataSourceGCE.py (+2/-1)
tests/unittests/test_datasource/test_gce.py (+4/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1383794: [SRU] GCE datasource should use the short hostname

Undecided

Fix Released

Link a bug report

Related blueprints

1049. By Ben Howard on 2015-01-14

Use the short name for GCE hostnames per GCE's request (LP: #1383794).

1048. By Scott Moser on 2015-01-06

Enable user-data encoding support for GCE.

Enable user-data encoding support for GCE. Extended and updated tests to
support checking the user-data encoding.

User can now pass in user-data encoded in base64 and indicate they've
done so by adding a tag 'user-data-encoding' with value 'base64'.

1047. By Scott Moser on 2015-01-06

tools/run-pep8: remove leading ',' fed to --ignore

--ignore was being called with ',E121,E...' rather than
'E121,E...'.

that resulted in odd behavior, missing the pep8 errors that are fixed
here.

1046. By Scott Moser on 2014-12-09

tools/ccfg-merge-debug: fix for updated user-data/vendor-data

this was broken previously when user-data and vender-data were
brought together.

1045. By Joshua Harlow on 2014-12-01

Cleanups for netinfo.py

- Handle ipv6 route information not existing
  gracefully (for systems that don't have it)
- Fix the getgateway function (broken due to
  ipv4/ipv6 keys now existing in route info)
- Separate the centering of the route info ipv4
  information from the centering of the ipv6 information
  so that this looks prettier...
- Use try: except: else instead of settings value to
  None and then later checking for None (more pythonic
  this way)

1044. By Joshua Harlow on 2014-11-25

Fixes rpm spec file build issues (its not currently building).

Currently the rpm building process that cloud-init provides is
not working correctly. This adjusts the spec file, the setup.py
file and the distro files to ensure that it continues to work
as expected.

1043. By Joshua Harlow on 2014-11-25

Use assertNotEqual which exists on python2.6

Instead of using assertGreater which is new on
python2.7 just use assertNotEqual which does exist
on python2.6 to perform the same/similar operation.

This makes the unittest not break on python2.6

1042. By Joshua Harlow on 2014-11-25

IPv6 support for rhel distro

When the ubuntu networking info file has ipv6 addresses inside
it we need to make sure that we parse that information out and
place it (at least) in the rhel network configuration writing.

In later patches the other distros that use this parsed network
configuration will likely also need to be updated (ubuntu and
debian already should function as expected with regard to ipv6
support).

1041. By Joshua Harlow on 2014-11-22

Update to use a newer and better OMNIBUS_URL

This is minor change which uses the new Chef (company) top
level domain for grabbing the Omnibus installation shell script.

1040. By Joshua Harlow on 2014-11-22

Be more tolerant of 'ssh_authorized_keys' types

Instead of only expected a list, tuple, or set type
allow for a string type and dict to be passed in for 'ssh_authorized_keys',
and add log message that occurs if some other type is used that
can not be correctly processed.