Merge lp:~daniel-thewatkins/cloud-init/openstack-vendor-data-doc into lp:~cloud-init-dev/cloud-init/trunk

[Dan Watkins]

=== modified file 'doc/rtd/topics/datasources.rst'
--- doc/rtd/topics/datasources.rst	2015-04-04 01:40:17 +0000
+++ doc/rtd/topics/datasources.rst	2015-05-28 11:31:06 +0000
@@ -177,6 +177,12 @@
 For now see: https://bazaar.launchpad.net/~cloud-init-dev/cloud-init/trunk/files/head:/doc/sources/ovf/
 
 ---------------------------
+OpenStack
+---------------------------
+
+.. include:: ../../sources/openstack/README.rst
+
+---------------------------
 Fallback/None
 ---------------------------
 

=== added directory 'doc/sources/openstack'
=== added file 'doc/sources/openstack/README.rst'
--- doc/sources/openstack/README.rst	1970-01-01 00:00:00 +0000
+++ doc/sources/openstack/README.rst	2015-05-28 11:31:06 +0000
@@ -0,0 +1,24 @@
+*TODO*
+
+Vendor Data
+~~~~~~~~~~~
+
+The OpenStack metadata server can be configured to serve up vendor data
+which is available to all instances for consumption.  OpenStack vendor
+data is, generally, a JSON object.
+
+cloud-init will look for configuration in the ``cloud-init`` attribute
+of the vendor data JSON object. cloud-init processes this configuration
+using the same handlers as user data, so any formats that work for user
+data should work for vendor data.
+
+For example, configuring the following as vendor data in OpenStack would
+upgrade packages and install ``htop`` on all instances:
+
+.. sourcecode:: json
+
+    {"cloud-init": "#cloud-config\npackage_upgrade: True\npackages:\n - htop"}
+
+For more general information about how cloud-init handles vendor data,
+including how it can be disabled by users on instances, see
+https://bazaar.launchpad.net/~cloud-init-dev/cloud-init/trunk/view/head:/doc/vendordata.txt