summaryrefslogtreecommitdiff
path: root/doc/sources
diff options
context:
space:
mode:
authorScott Moser <smoser@brickies.net>2016-11-04 13:46:09 -0400
committerScott Moser <smoser@brickies.net>2016-11-04 13:46:09 -0400
commitb380e16183446f2e39f47a3c0804d2081714acb2 (patch)
treea5e05b4a22553769d6eaa7e5fa93e3401a758b2b /doc/sources
parent882b22e024733e17757fdbe36ba2a3672c6ebe06 (diff)
parenta1cdebdea65ccd827060c823146992bba9debe19 (diff)
downloadvyos-cloud-init-b380e16183446f2e39f47a3c0804d2081714acb2.tar.gz
vyos-cloud-init-b380e16183446f2e39f47a3c0804d2081714acb2.zip
merge from master at 0.7.8-34-ga1cdebd
Diffstat (limited to 'doc/sources')
-rw-r--r--doc/sources/altcloud/README.rst8
-rw-r--r--doc/sources/configdrive/README.rst4
2 files changed, 6 insertions, 6 deletions
diff --git a/doc/sources/altcloud/README.rst b/doc/sources/altcloud/README.rst
index b5d72ebb..0a54fda1 100644
--- a/doc/sources/altcloud/README.rst
+++ b/doc/sources/altcloud/README.rst
@@ -14,7 +14,7 @@ The format of the Custom Properties entry must be:
For example to pass a simple bash script:
-::
+.. sourcecode:: sh
% cat simple_script.bash
#!/bin/bash
@@ -55,13 +55,13 @@ For example, to pass the same ``simple_script.bash`` to vSphere:
Create the ISO
-----------------
-::
+.. sourcecode:: sh
% mkdir my-iso
NOTE: The file name on the ISO must be: ``user-data.txt``
-::
+.. sourcecode:: sh
% cp simple_scirpt.bash my-iso/user-data.txt
% genisoimage -o user-data.iso -r my-iso
@@ -69,7 +69,7 @@ NOTE: The file name on the ISO must be: ``user-data.txt``
Verify the ISO
-----------------
-::
+.. sourcecode:: sh
% sudo mkdir /media/vsphere_iso
% sudo mount -o loop JoeV_CI_02.iso /media/vsphere_iso
diff --git a/doc/sources/configdrive/README.rst b/doc/sources/configdrive/README.rst
index 48ff579d..8c40735f 100644
--- a/doc/sources/configdrive/README.rst
+++ b/doc/sources/configdrive/README.rst
@@ -46,7 +46,7 @@ The following criteria are required to as a config drive:
formatted.
Version 2
-~~~~~~~~~~~
+~~~~~~~~~
The following criteria are required to as a config drive:
@@ -70,7 +70,7 @@ The following criteria are required to as a config drive:
- meta-data.json (not mandatory)
Keys and values
-~~~~~~~~~~~
+~~~~~~~~~~~~~~~
Cloud-init's behavior can be modified by keys found in the meta.js (version 1 only) file in the following ways.