Created by Joshua Harlow on 2014-12-09 and last modified on 2014-12-09
Get this branch:
bzr branch lp:~harlowja/cloud-init/adjusted-merging
Only Joshua Harlow can upload to this branch. If you are Joshua Harlow please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Joshua Harlow

Recent revisions

1047. By Joshua Harlow on 2014-12-09

Fix merging sample testcase.

1046. By Joshua Harlow on 2014-12-09

Adjust so that recursive strategies take precendence

Instead of preferring the 'do_replace' value over provided
recursive type strategies, instead prefer the recursive type
strategies for dictionaries over the 'do_replace' value.

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

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.

1039. By Joshua Harlow on 2014-11-22

Pretty up the debug module

Previously the usage of the yaml_dumps module was causing
any python unicode key and value to show up as:

'item': !!python/unicode "some string"

This was not very pretty...

Fix this by using safe_dumps (which is also a good thing to
use and allow_unicode=True). Also create a tiny helper function
in the cc_debug module that does not include the yaml start and
end footers (since this module has its own footers and headers).

Also includes a basic sanity test for this module.

1038. By Joshua Harlow on 2014-11-22

Fix parse_ssh_config failing in ssh_util.py

This fix handles '=' as a delimiter in SSH config and
adds appropriate test methods to ensure this functionality
continues to work correctly.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.