Merge lp:~craigtracey/cloud-init/update-etc-hosts into lp:~cloud-init-dev/cloud-init/trunk
Proposed by
Craig Tracey
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 775 | ||||
Proposed branch: | lp:~craigtracey/cloud-init/update-etc-hosts | ||||
Merge into: | lp:~cloud-init-dev/cloud-init/trunk | ||||
Diff against target: |
170 lines (+55/-30) 8 files modified
cloudinit/config/__init__.py (+3/-1) cloudinit/config/cc_update_etc_hosts.py (+3/-2) cloudinit/distros/__init__.py (+15/-0) cloudinit/distros/debian.py (+1/-0) cloudinit/distros/rhel.py (+1/-0) cloudinit/stages.py (+7/-2) templates/hosts.debian.tmpl (+25/-0) templates/hosts.ubuntu.tmpl (+0/-25) |
||||
To merge this branch: | bzr merge lp:~craigtracey/cloud-init/update-etc-hosts | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Joshua Harlow (community) | Needs Fixing | ||
Review via email:
|
Description of the change
Fix broken cc_update_etc_hosts (LP: #1100036)
Right now, all distros but ubuntu will fail to manage /etc/hosts. This
is due to the fact that the templates are named:
- hosts.ubuntu.tmpl
- hosts.redhat.tmpl
The config handler is specifically looking for a template with the
given distro name.
This change addresses this issue and is contingent upon support of
'osfamilies' as implemented in LP: #1100029
(lp:~craigtracey/cloud-init/osfamilies)
To post a comment you must log in.
Does distro attribute 'self.osfamily = 'redhat'' need to be hard-coded?
The nice thing about having this come from yaml (the system_info section) is that it doesn't need to be (so can be configured to be different). Do u think this should happen? Seems useful?