cloud-init

Merge lp:~oddbloke/cloud-init/rtd_examples_datasources_disks into lp:~cloud-init-dev/cloud-init/trunk

  1. rtd_examples_datasources_disks
  2. Merge into trunk
Proposed by Dan Watkins
Status: Merged
Merged at revision: not available
Proposed branch: lp:~oddbloke/cloud-init/rtd_examples_datasources_disks
Merge into: lp:~cloud-init-dev/cloud-init/trunk
Diff against target: 81 lines (+34/-6)
1 file modified
doc/rtd/topics/examples.rst (+34/-6)
To merge this branch: bzr merge lp:~oddbloke/cloud-init/rtd_examples_datasources_disks
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Needs Fixing
Dan Watkins Approve
cloud-init Commiters Pending
Review via email: mp+260455@code.launchpad.net

Description of the change

X-CPC-Summary-Skip: 1

To post a comment you must log in.
Revision history for this message
Dan Watkins (oddbloke) wrote :

LGTM.

review: Approve
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

FAILED: Continuous integration, rev:1110
https://server-team-jenkins.canonical.com/job/cloud-init-ci/46/
Executed test runs:
    None: https://server-team-jenkins.canonical.com/job/lp-vote-on-merge/20/console

Click here to trigger a rebuild:
https://server-team-jenkins.canonical.com/job/cloud-init-ci/46/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Scott Moser (smoser) wrote :

merged under https://code.launchpad.net/~powersj/cloud-init/+git/cloud-init/+merge/322317

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/rtd/topics/examples.rst'
2--- doc/rtd/topics/examples.rst 2013-01-28 18:28:09 +0000
3+++ doc/rtd/topics/examples.rst 2015-05-28 10:30:31 +0000
4@@ -1,8 +1,8 @@
5 .. _yaml_examples:
6
7-=========
8+=====================
9 Cloud config examples
10-=========
11+=====================
12
13 Including users and groups
14 ---------------------------
15@@ -80,7 +80,7 @@
16
17
18 Alter the completion message
19----------------------------
20+----------------------------
21
22 .. literalinclude:: ../../examples/cloud-config-final-message.txt
23 :language: yaml
24@@ -100,6 +100,13 @@
25 :language: yaml
26 :linenos:
27
28+Update apt database on first boot
29+---------------------------------
30+
31+.. literalinclude:: ../../examples/cloud-config-update-apt.txt
32+ :language: yaml
33+ :linenos:
34+
35 Adjust mount points mounted
36 ---------------------------
37
38@@ -115,19 +122,40 @@
39 :linenos:
40
41 Reboot/poweroff when finished
42----------------------------
43+-----------------------------
44
45 .. literalinclude:: ../../examples/cloud-config-power-state.txt
46 :language: yaml
47 :linenos:
48
49 Configure instances ssh-keys
50----------------------------
51+----------------------------
52
53 .. literalinclude:: ../../examples/cloud-config-ssh-keys.txt
54 :language: yaml
55 :linenos:
56-
57+
58+Configure data sources
59+----------------------
60+
61+.. literalinclude:: ../../examples/cloud-config-datasources.txt
62+ :language: yaml
63+ :linenos:
64+
65+Create partitions and filesystems
66+---------------------------------
67+
68+.. literalinclude:: ../../examples/cloud-config-disk-setup.txt
69+ :language: yaml
70+ :linenos:
71+
72+Grow partitions
73+---------------
74+
75+.. literalinclude:: ../../examples/cloud-config-growpart.txt
76+ :language: yaml
77+ :linenos:
78+
79
80 .. _chef: http://www.opscode.com/chef/
81 .. _puppet: http://puppetlabs.com/