From 4b88403690b21eff0b6efcb4986c2b21aaf9e31f Mon Sep 17 00:00:00 2001 From: BetaGrumm Date: Wed, 9 Dec 2015 11:49:04 -0800 Subject: [PATCH 1/2] Update file.html.markdown Fixed typo: Missing "i" in the word "will". --- website/source/docs/provisioners/file.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/source/docs/provisioners/file.html.markdown b/website/source/docs/provisioners/file.html.markdown index 7799721a5..bb66fc220 100644 --- a/website/source/docs/provisioners/file.html.markdown +++ b/website/source/docs/provisioners/file.html.markdown @@ -44,7 +44,7 @@ The available configuration options are listed below. All elements are required. - `direction` (string) - The direction of the file transfer. This defaults to "upload." If it is set to "download" then the file "source" in the machine - wll be downloaded locally to "destination" + will be downloaded locally to "destination" ## Directory Uploads From 7271b6ac8d0e88a33a5dbb4e83e1a41e2b659be3 Mon Sep 17 00:00:00 2001 From: Ian Duffy Date: Wed, 9 Dec 2015 22:28:47 +0000 Subject: [PATCH 2/2] Add documentation for config_drive Signed-off-by: Ian Duffy --- website/source/docs/builders/openstack.html.markdown | 3 +++ 1 file changed, 3 insertions(+) diff --git a/website/source/docs/builders/openstack.html.markdown b/website/source/docs/builders/openstack.html.markdown index 12a1ca882..cb54b52d2 100644 --- a/website/source/docs/builders/openstack.html.markdown +++ b/website/source/docs/builders/openstack.html.markdown @@ -103,6 +103,9 @@ builder. - `metadata` (object of key/value strings) - Glance metadata that will be applied to the image. +- `config_drive` (boolean) - Whether or not nova should use ConfigDrive for + cloud-init metadata. + ## Basic Example: Rackspace public cloud Here is a basic example. This is a working example to build a Ubuntu 12.04 LTS