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
=== modified file 'doc/rtd/topics/datasources.rst'
--- doc/rtd/topics/datasources.rst 2014-01-17 22:08:58 +0000
+++ doc/rtd/topics/datasources.rst 2015-04-04 01:48:55 +0000
@@ -166,7 +166,7 @@
166CloudStack166CloudStack
167---------------------------167---------------------------
168168
169*TODO*169.. include:: ../../sources/cloudstack/README.rst
170170
171---------------------------171---------------------------
172OVF172OVF
173173
=== added directory 'doc/sources/cloudstack'
=== added file 'doc/sources/cloudstack/README.rst'
--- doc/sources/cloudstack/README.rst 1970-01-01 00:00:00 +0000
+++ doc/sources/cloudstack/README.rst 2015-04-04 01:48:55 +0000
@@ -0,0 +1,29 @@
1`Apache CloudStack`_ expose user-data, meta-data, user password and account
2sshkey thru the Virtual-Router. For more details on meta-data and user-data,
3refer the `CloudStack Administrator Guide`_.
4
5URLs to access user-data and meta-data from the Virtual Machine. Here 10.1.1.1
6is the Virtual Router IP:
7
8.. code:: bash
9
10 http://10.1.1.1/latest/user-data
11 http://10.1.1.1/latest/meta-data
12 http://10.1.1.1/latest/meta-data/{metadata type}
13
14Configuration
15~~~~~~~~~~~~~
16
17Apache CloudStack datasource can be configured as follows:
18
19.. code:: yaml
20
21 datasource:
22 CloudStack: {}
23 None: {}
24 datasource_list:
25 - CloudStack
26
27
28.. _Apache CloudStack: http://cloudstack.apache.org/
29.. _CloudStack Administrator Guide: http://docs.cloudstack.apache.org/projects/cloudstack-administration/en/latest/virtual_machines.html#user-data-and-meta-data
0\ No newline at end of file30\ No newline at end of file