Merge lp:~gpadgett/cloud-init/ovirt into lp:~cloud-init-dev/cloud-init/trunk
Proposed by
Greg Padgett
Status: | Merged |
---|---|
Merged at revision: | 809 |
Proposed branch: | lp:~gpadgett/cloud-init/ovirt |
Merge into: | lp:~cloud-init-dev/cloud-init/trunk |
Diff against target: |
173 lines (+63/-22) 5 files modified
cloudinit/distros/rhel.py (+53/-20) cloudinit/sources/DataSourceConfigDrive.py (+3/-0) cloudinit/sources/DataSourceNoCloud.py (+3/-0) cloudinit/util.py (+1/-0) tests/unittests/test_datasource/test_configdrive.py (+3/-2) |
To merge this branch: | bzr merge lp:~gpadgett/cloud-init/ovirt |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
cloud-init Commiters | Pending | ||
Review via email: mp+155634@code.launchpad.net |
Description of the change
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
To post a comment you must log in.
this looks fine to me, the only question i have is over 'blkid' usage and /dev/sr0.
I have one concern. At one point I was just trying 'mount /dev/sr0' and expecting that to time out quickly, but it turned out that that was taking 18 seconds to time out in a VM with an empty cd-rom. (see revision 350).
I just want to make sure that we're not going todo something similar here. I suspect not, but would like to make sure that you've verified that boot speed is not affected significantly by this.
Reguarding the systemd changes, I largely have to blindly trust you.
Maybe Josh can sanity check?