summaryrefslogtreecommitdiff
path: root/doc/rtd/topics
diff options
context:
space:
mode:
authorJoshua Harlow <harlowja@yahoo-inc.com>2013-01-28 10:28:09 -0800
committerJoshua Harlow <harlowja@yahoo-inc.com>2013-01-28 10:28:09 -0800
commit62f0f1745677e3422b12a9aaa96ba3e5452db94d (patch)
tree6d3a1ddbc532eb7ce79601322f24d454cb200f3d /doc/rtd/topics
parentb602d138686bd6653a67efd61d7c245347d14dcb (diff)
downloadvyos-cloud-init-62f0f1745677e3422b12a9aaa96ba3e5452db94d.tar.gz
vyos-cloud-init-62f0f1745677e3422b12a9aaa96ba3e5452db94d.zip
Include the resolv.conf example.
Diffstat (limited to 'doc/rtd/topics')
-rw-r--r--doc/rtd/topics/examples.rst14
1 files changed, 13 insertions, 1 deletions
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
------------------------------------------------------