Merge lp:~pdion891/cloud-init/cloud-init into lp:~cloud-init-dev/cloud-init/trunk

Proposed by pdion891
Status: Merged
Merged at revision: 1095
Proposed branch: lp:~pdion891/cloud-init/cloud-init
Merge into: lp:~cloud-init-dev/cloud-init/trunk
Diff against target: 48 lines (+30/-1)
2 files modified
doc/rtd/topics/datasources.rst (+1/-1)
doc/sources/cloudstack/README.rst (+29/-0)
To merge this branch: bzr merge lp:~pdion891/cloud-init/cloud-init
Reviewer Review Type Date Requested Status
Joshua Harlow (community) Approve
Review via email: mp+255222@code.launchpad.net

Description of the change

Documentation for CloudStack as datasource, initial step, the current documentation is working and has been tested with cloud-init from Ubuntu 14.04, CentOS7 on CloudStack 4.4.x and 4.5.x.

Regards,

To post a comment you must log in.
Revision history for this message
Joshua Harlow (harlowja) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/rtd/topics/datasources.rst'
2--- doc/rtd/topics/datasources.rst 2014-01-17 22:08:58 +0000
3+++ doc/rtd/topics/datasources.rst 2015-04-04 01:48:55 +0000
4@@ -166,7 +166,7 @@
5 CloudStack
6 ---------------------------
7
8-*TODO*
9+.. include:: ../../sources/cloudstack/README.rst
10
11 ---------------------------
12 OVF
13
14=== added directory 'doc/sources/cloudstack'
15=== added file 'doc/sources/cloudstack/README.rst'
16--- doc/sources/cloudstack/README.rst 1970-01-01 00:00:00 +0000
17+++ doc/sources/cloudstack/README.rst 2015-04-04 01:48:55 +0000
18@@ -0,0 +1,29 @@
19+`Apache CloudStack`_ expose user-data, meta-data, user password and account
20+sshkey thru the Virtual-Router. For more details on meta-data and user-data,
21+refer the `CloudStack Administrator Guide`_.
22+
23+URLs to access user-data and meta-data from the Virtual Machine. Here 10.1.1.1
24+is the Virtual Router IP:
25+
26+.. code:: bash
27+
28+ http://10.1.1.1/latest/user-data
29+ http://10.1.1.1/latest/meta-data
30+ http://10.1.1.1/latest/meta-data/{metadata type}
31+
32+Configuration
33+~~~~~~~~~~~~~
34+
35+Apache CloudStack datasource can be configured as follows:
36+
37+.. code:: yaml
38+
39+ datasource:
40+ CloudStack: {}
41+ None: {}
42+ datasource_list:
43+ - CloudStack
44+
45+
46+.. _Apache CloudStack: http://cloudstack.apache.org/
47+.. _CloudStack Administrator Guide: http://docs.cloudstack.apache.org/projects/cloudstack-administration/en/latest/virtual_machines.html#user-data-and-meta-data
48\ No newline at end of file