| Age | Commit message (Collapse) | Author |
|---|
|
|
|
The new change for merging works well in the mergedict case
but the default merging type for cloud config needs to reflect
how yaml was loaded in bulk, which is the same as the replacing
keys merging type that is now provided.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Looks like this should be in pretty good shape and has passed some
of the basic backwards compat. merging tests that I added.
|
|
|
|
|
|
|
|
|
|
|
|
Move from using the inbuilt type names (str, dict) as module names
which is a bad thing to use it appears due to naming conflicts
in the __init__ module and reduce the chances of these conflicts
by enforcing a m_ prefix for merging modules.
|
|
|
|
Exeptions were being swallowed completely and no way to even see them
other than log.
|
|
Move from using the inbuilt type names as module names
which is a bad thing to use it appears due to naming conflicts
in the __init__ module and reduce the chances of these conflicts
by enforcing a m_ prefix for merging modules.
|
|
This branch contains fixes found while investigating integration of cloud-init
into oVirt. They're in 3 categories:
- compatibility with systemd configuration management (as used in Fedora 18)
- workaround for a 2.6 kernel quirk which prevented 'blkid' from displaying
/dev/sr0 in some cases
- writing sysconfig files in typical convention, with a newline preceding EOF,
to make some parsers happy
|
|
There were problems with these tools if the path had a space. This should
make these tools safe. There are others that still have problems.
|
|
There were problems with these tools if the path had a space. This should
make these tools safe. There are others that still have problems.
|
|
|
|
dist-upgrade is generally more correct here to get all packages upgraded.
We add the options to change these in system_info. Also, document
the previous apt configuration change (apt_get_command).
LP: #1164147
|
|
In general, dist-upgrade is the correct behavior here.
It will get a new kernel, though, which could be annoying. So, allow
a way to turn it off (by setting 'apt_get_upgrade_subcommand: upgrade').
LP: #1164147
|
|
It had been changed in code, but not in docs. So we needed
to reflect the change in docs as well so that both are in
sync.
|
|
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)
|
|
Now, errors will not be so annoying if the device doesn't exist.
Specifically, if there is no device in a container, only debug messages
will be logged.
LP: #1160462
|
|
In starting containers in lxc, I was seeing errors like:
/proc/self/fd/9: 24: kill: No such process
Which indicated the sleep pid had already died.
I'm not sure how or why it was dead, but this just is less annoying in that
case.
|
|
|
|
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.
|
|
|
|
cloudinit/sources/DataSourceCloudStack.py and
cloudinit/sources/DataSourceEc2.py are reverted entirely back to trunk versions
now, rather than the non-behavior change that was left in place.
Also, remove inadvertantly added trailing newline from cloudinit/ec2_utils.py
Overall, this just makes the diff when merged to trunk carry more focused
changes.
|
|
|
|
|
|
|
|
this shouldn't change anything, only the signatures of the methods.
|
|
the previous implementation of url_helper.readurl() would default
to allow_redirects being true.
So, for backwards compat, we should keep that behavior.
|
|
if the error is an ssl error, its extremely unlikely that it would be fixed by
waiting a few seconds and trying again.
|
|
* cloudinit/distros/parsers/resolv_conf.py
added some pylint overrides with 'plXXXXX' syntax.
example: # pl51222 pylint: disable=E0102
The pl51222 there means: http://www.logilab.org/ticket/51222
This specific issue is present in 12.04 pylint, but not 13.04.
* pylint doesn't like the requests special handling we have.
which makes sense as it is only checking versus one specific version.
* general pep8 and pylint cleanups.
|
|
|
|
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.
|
|
|
|
in earlier versions of requests (pre 0.10.8).
|
|
|
|
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)
LP: #1154599
|
|
1) Refactor util.get_mount_info() to facilitate unit testing.
2) Add unit tests for /proc/$$/mountinfo parsing.
|
|
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.
|
|
|
|
|
|
Refactor the parsing portion of util.get_mount_info() into a new
util.parse_mount_info() method. Now util.get_mount_info() opens
/proc/$$/mountinfo, splits on newlines and passes the lines to
util.parse_mount_info().
|
