lp:~gpadgett/cloud-init/ovirt

Created by Greg Padgett and last modified
Get this branch:
bzr branch lp:~gpadgett/cloud-init/ovirt
Only Greg Padgett can upload to this branch. If you are Greg Padgett please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Greg Padgett
Project:
cloud-init
Status:
Merged

Recent revisions

802. By Greg Padgett

compatibility fixes for Fedora and RHEL

This patch fixes issues in Fedora 18 (and upcoming RHEL 7) which are
present due to their use of systemd:

 - store locale configuration in /etc/locale.conf
 - store hostname in /etc/hostname
 - use a symlink for /etc/localtime (prior code would set the timezone
   but corrupt data in /usr/share/zoneinfo due to presence of symlink)

It also contains fixes for issues unrelated to systemd adoption:

 - explicitly scan /dev/sr0 with blkid in order to get the optical drive
   in the blkid cache. This prevents an issue on systems running 2.6
   kernels (such as RHEL 6) in which config disks on some devices won't
   be detected unless the device has previously been queried.
    (For reference, see https://patchwork.kernel.org/patch/1770241/)
 - append a newline when rewriting sysconfig files, as this is customary
   text configuration file formatting and is expected by some parsers
   (such as the ifcfg-rh plugin for NetworkManager)

801. By Scott Moser

use 'requests' rather than urllib2.

This re-works the urlhelper and users of it to use requests rather
than urllib2. The primary benefit is that now when using recent
versions of python-requests (>= 0.8.8) https certificates will be checked.

800. By Scott Moser

pylint fixes

a.) appease pylint on raring, as it doesn't like subprocess
    pylint: 0.26.0-1ubuntu1
    This is mentioned in comments at http://www.logilab.org/ticket/46273

b.) tests/unittests/test_util.py:
    the mountinfo lines are longer than 80 chars.
    Just disable long lines complaints for this file.

799. By Scott Moser

fix / workaround potential for socket.getaddrinfo to raise socket.error

As reported in bug 1154599, I'm seeing this on my desktop system:
$ python -c \
  'from cloudinit import util; print util.is_resolvable("brickies.neiit")'
Traceback (most recent call last):
  File "<string>", line 1, in <module>
  File "cloudinit/util.py", line 865, in is_resolvable
    socket.SOCK_STREAM, socket.AI_CANONNAME)

798. By Blair Zajac

refactor get_mount_info and add tests

1) Refactor util.get_mount_info() to facilitate unit testing.
2) Add unit tests for /proc/$$/mountinfo parsing.

797. By Scott Moser

skip unit test due to LP: #1124384

This re-applies the change in revno 785.
A merge made this test pass rather than skip, but I'd rather have
it skip for now, as we really hope to have the upstart bug fixed.

796. By Joshua Harlow

Enable the merging.txt to be in .rst format for public viewing

795. By Scott Moser

support different and user-suppliable merging algorithms for cloud-config

This adds a very useful mechanism for merging cloud-config, allowing
the user to append to lists (ie, just add more 'run_cmd') or other
things.

See doc/merging.txt for more information, it is intended to be backwards
compatible by default.

794. By Scott Moser

pep8

793. By Scott Moser

fix a pylint complaint in test_handler_growpart

E1103: 81,44:TestWriteFile.test_basic_usage: Instance of 'Bunch' has no
   'st_mode' member (but some types could not be inferred)

so, if it wants st_mode, for now just give it one.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:~cloud-init-dev/cloud-init/trunk
This branch contains Public information 
Everyone can see this information.