cloud-init-dev team mailing list archive

[Brian Candler <b.candler@xxxxxxxxx>]

Brian Candler has proposed merging ~b-candler/cloud-init:nocloud-doc into cloud-init:master.

Requested reviews:
  cloud-init commiters (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~b-candler/cloud-init/+git/cloud-init/+merge/327059
-- 
Your team cloud-init commiters is requested to review the proposed merge of ~b-candler/cloud-init:nocloud-doc into cloud-init:master.

diff --git a/doc/rtd/topics/datasources/nocloud.rst b/doc/rtd/topics/datasources/nocloud.rst
index 665057f..08578e8 100644
--- a/doc/rtd/topics/datasources/nocloud.rst
+++ b/doc/rtd/topics/datasources/nocloud.rst
@@ -24,6 +24,16 @@ or
 
   ds=nocloud-net[;key=val;key=val]
 
+The permitted keys are:
+
+- ``h`` or ``local-hostname``
+- ``i`` or ``instance-id``
+- ``s`` or ``seedfrom``
+
+With ``ds=nocloud``, the ``seedfrom`` value must start with ``/`` or
+``file://``.  With ``ds=nocloud-net``, the ``seedfrom`` value must start
+with ``http://``, ``https://`` or ``ftp://``
+
 e.g. you can pass this option to QEMU:
 
 ::