← Back to team overview

cloud-init-dev team mailing list archive

Re: [Merge] ~bregeer-ctl/cloud-init:bugfix/centos7_resolv into cloud-init:master


This generally looks good.
cloud-init gets network configuration from a variety of sources (openstack config drive in 'interfaces(5)' format, config drive in network_data.json format, Nocloud in 'network_config' format....  

Some of those have per-interface dns configuration, some do not.  It'd be nice to render this per-interface information when we can.

And even in the openstack interfaces 5 format it *could* declare per-network-device dns entries (the parser supports maintaining that information).

The second thing, you need to sign the canonical contributors agreement (http://www.ubuntu.com/legal/contributors).  Please do so, and mention to me that you have in irc or here.  Let me know if you have any questions on that.

Diff comments:

> diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
> index c53acf7..a5d6611 100644
> --- a/cloudinit/net/sysconfig.py
> +++ b/cloudinit/net/sysconfig.py
> @@ -206,6 +209,10 @@ class Renderer(renderer.Renderer):
>          self.netrules_path = config.get(
>              'netrules_path', 'etc/udev/rules.d/70-persistent-net.rules')
>          self.dns_path = config.get('dns_path', 'etc/resolv.conf')
> +        self.dns_symlink = config.get('dns_symlink', True)
> +
> +        self.dns_write_path = config.get('dns_write_path', 'etc/resolv.conf.cloud') \

i really prefer without the backslash.

if self.dns_symlink:
   self.dns_write_path = config.get('dns_write_path', 'etc/resolv.conf.cloud')

> +            if self.dns_symlink else self.dns_path
>      @classmethod
>      def _render_iface_shared(cls, iface, iface_cfg):

Your team cloud init development team is requested to review the proposed merge of ~bregeer-ctl/cloud-init:bugfix/centos7_resolv into cloud-init:master.