From 1071b9940b4e114cd2eabf290b739f92fbab33de Mon Sep 17 00:00:00 2001 From: Wesley Wiedenmeier Date: Sun, 28 Aug 2016 17:56:17 -0500 Subject: Improve module documentation and doc cleanup. This adds lots of config module documentation in a standard format. It will greatly improve the content at readthedocs. Additionally: * Add a 'doc' env to tox.ini * Changed default highlight language for sphinx conf from python to yaml most examples in documentation are yaml configs * Updated datasource examples to highlight sh code properly --- cloudinit/config/cc_resolv_conf.py | 69 +++++++++++++++++++++----------------- 1 file changed, 39 insertions(+), 30 deletions(-) (limited to 'cloudinit/config/cc_resolv_conf.py') diff --git a/cloudinit/config/cc_resolv_conf.py b/cloudinit/config/cc_resolv_conf.py index 71d9e3a7..feea5653 100644 --- a/cloudinit/config/cc_resolv_conf.py +++ b/cloudinit/config/cc_resolv_conf.py @@ -18,36 +18,45 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# Note: -# This module is intended to manage resolv.conf in environments where -# early configuration of resolv.conf is necessary for further -# bootstrapping and/or where configuration management such as puppet or -# chef own dns configuration. As Debian/Ubuntu will, by default, utilize -# resovlconf, and similarly RedHat will use sysconfig, this module is -# likely to be of little use unless those are configured correctly. -# -# For RedHat with sysconfig, be sure to set PEERDNS=no for all DHCP -# enabled NICs. And, in Ubuntu/Debian it is recommended that DNS -# be configured via the standard /etc/network/interfaces configuration -# file. -# -# -# Usage Example: -# -# #cloud-config -# manage_resolv_conf: true -# -# resolv_conf: -# nameservers: ['8.8.4.4', '8.8.8.8'] -# searchdomains: -# - foo.example.com -# - bar.example.com -# domain: example.com -# options: -# rotate: true -# timeout: 1 -# - +""" +Resolv Conf +----------- +**Summary:** configure resolv.conf + +This module is intended to manage resolv.conf in environments where early +configuration of resolv.conf is necessary for further bootstrapping and/or +where configuration management such as puppet or chef own dns configuration. +As Debian/Ubuntu will, by default, utilize resovlconf, and similarly RedHat +will use sysconfig, this module is likely to be of little use unless those +are configured correctly. + +.. note:: + For RedHat with sysconfig, be sure to set PEERDNS=no for all DHCP + enabled NICs. + +.. note:: + And, in Ubuntu/Debian it is recommended that DNS be configured via the + standard /etc/network/interfaces configuration file. + +**Internal name:** ``cc_resolv_conf`` + +**Module frequency:** per instance + +**Supported distros:** fedora, rhel, sles + +**Config keys**:: + + manage_resolv_conf: + resolv_conf: + nameservers: ['8.8.4.4', '8.8.8.8'] + searchdomains: + - foo.example.com + - bar.example.com + domain: example.com + options: + rotate: + timeout: 1 +""" from cloudinit import log as logging from cloudinit.settings import PER_INSTANCE -- cgit v1.2.3