summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2015-06-01 16:25:15 -0400
committerScott Moser <smoser@ubuntu.com>2015-06-01 16:25:15 -0400
commit5a8f6c82da94ab87f21b39dc30a0e85ddbc85216 (patch)
tree4f8904f65989e60de5d682aea7dd5002546474df
parent12e739da7a0586eabc244a68eed51f5e12dfa087 (diff)
parent09cf2e1caf628f6b61c35a454dbea6b6a8c2e7aa (diff)
downloadvyos-cloud-init-5a8f6c82da94ab87f21b39dc30a0e85ddbc85216.tar.gz
vyos-cloud-init-5a8f6c82da94ab87f21b39dc30a0e85ddbc85216.zip
Doc: include information on vendor-data in OpenStack
-rw-r--r--ChangeLog1
-rw-r--r--doc/rtd/topics/datasources.rst6
-rw-r--r--doc/sources/openstack/README.rst24
3 files changed, 31 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 8d59d024..68b1a459 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -43,6 +43,7 @@
- Azure: remove dependency on walinux-agent [Daniel Watkins]
- EC2: know about eu-central-1 availability-zone (LP: #1456684)
- Azure: remove password from on-disk ovf-env.xml (LP: #1443311) [Ben Howard]
+ - Doc: include information on user-data in OpenStack [Daniel Watkins]
0.7.6:
- open 0.7.6
- Enable vendordata on CloudSigma datasource (LP: #1303986)
diff --git a/doc/rtd/topics/datasources.rst b/doc/rtd/topics/datasources.rst
index a2024bdc..0d7d4aca 100644
--- a/doc/rtd/topics/datasources.rst
+++ b/doc/rtd/topics/datasources.rst
@@ -177,6 +177,12 @@ OVF
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
---------------------------
diff --git a/doc/sources/openstack/README.rst b/doc/sources/openstack/README.rst
new file mode 100644
index 00000000..8102597e
--- /dev/null
+++ b/doc/sources/openstack/README.rst
@@ -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