diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | cloudinit/config/cc_resolv_conf.py | 4 | ||||
| -rw-r--r-- | cloudinit/config/cc_update_etc_hosts.py | 5 | ||||
| -rw-r--r-- | doc/rtd/topics/examples.rst | 14 | ||||
| -rw-r--r-- | templates/hosts.debian.tmpl (renamed from templates/hosts.ubuntu.tmpl) | 0 |
5 files changed, 30 insertions, 5 deletions
@@ -22,6 +22,18 @@ mounts. [Vlastimil Holer] - allow config-drive-data to come from a CD device by more correctly filtering out partitions. (LP: #1100545) + - setup docs to be available on read-the-docs + https://cloudinit.readthedocs.org/en/latest/ (LP: #1093039) + - add HACKING file for information on contributing + - handle the legacy 'user:' configuration better, making it affect the + configured OS default user (LP: #1100920) + - Adding a resolv.conf configuration module (LP: #1100434). Currently only + working on redhat systems (no support for resolvconf) + - support grouping linux distros into "os_families". This allows a module + to operate on the family (redhat or debian) rather than the distro (ubuntu, + debian, fedora, rhel) (LP: #1100029) + - fix /etc/hosts writing when templates are used (LP: #1100036) + - add package versioning logic to package installation functionality (LP: #1108047) 0.7.1: - sysvinit: fix missing dependency in cloud-init job for RHEL 5.6 - config-drive: map hostname to local-hostname (LP: #1061964) diff --git a/cloudinit/config/cc_resolv_conf.py b/cloudinit/config/cc_resolv_conf.py index 17c74695..8a460f7e 100644 --- a/cloudinit/config/cc_resolv_conf.py +++ b/cloudinit/config/cc_resolv_conf.py @@ -47,11 +47,11 @@ # -from cloudinit.settings import PER_ONCE +from cloudinit.settings import PER_INSTANCE from cloudinit import templater from cloudinit import util -frequency = PER_ONCE +frequency = PER_INSTANCE distros = ['fedora', 'rhel'] diff --git a/cloudinit/config/cc_update_etc_hosts.py b/cloudinit/config/cc_update_etc_hosts.py index 96103615..d3dd1f32 100644 --- a/cloudinit/config/cc_update_etc_hosts.py +++ b/cloudinit/config/cc_update_etc_hosts.py @@ -37,10 +37,11 @@ def handle(name, cfg, cloud, log, _args): # Render from a template file tpl_fn_name = cloud.get_template_filename("hosts.%s" % - (cloud.distro.name)) + (cloud.distro.osfamily)) if not tpl_fn_name: raise RuntimeError(("No hosts template could be" - " found for distro %s") % (cloud.distro.name)) + " found for distro %s") % + (cloud.distro.osfamily)) templater.render_to_file(tpl_fn_name, '/etc/hosts', {'hostname': hostname, 'fqdn': fqdn}) diff --git a/doc/rtd/topics/examples.rst b/doc/rtd/topics/examples.rst index 9bbc33cc..36508bde 100644 --- a/doc/rtd/topics/examples.rst +++ b/doc/rtd/topics/examples.rst @@ -27,13 +27,25 @@ Adding a yum repository :language: yaml :linenos: -Configure an instance's trusted CA certificates +Configure an instances trusted CA certificates ------------------------------------------------------ .. literalinclude:: ../../examples/cloud-config-ca-certs.txt :language: yaml :linenos: +Configure an instances resolv.conf +------------------------------------------------------ + +*Note:* when using a config drive and a RHEL like system resolv.conf +will also be managed 'automatically' due to the available information +provided for dns servers in the config drive network format. For those +that wish to have different settings use this module. + +.. literalinclude:: ../../examples/cloud-config-resolv-conf.txt + :language: yaml + :linenos: + Install and run `chef`_ recipes ------------------------------------------------------ diff --git a/templates/hosts.ubuntu.tmpl b/templates/hosts.debian.tmpl index ae120b02..ae120b02 100644 --- a/templates/hosts.ubuntu.tmpl +++ b/templates/hosts.debian.tmpl |