diff options
| author | Cosmin Luță <q4break@gmail.com> | 2012-03-09 22:38:29 +0200 |
|---|---|---|
| committer | Cosmin Luță <q4break@gmail.com> | 2012-03-09 22:38:29 +0200 |
| commit | a52691ec3a4ad6802597a214b2375cf438fe9fa0 (patch) | |
| tree | 8689bb2e2ac44f4ad7ae26691933bfc48a6d413d /doc | |
| parent | d8db2154fb7bc468ab2baa6e6f4a11db59251ae1 (diff) | |
| parent | 0d4fedc1f7bccd15e12e5f2a3fc829ed16d22c57 (diff) | |
| download | vyos-cloud-init-a52691ec3a4ad6802597a214b2375cf438fe9fa0.tar.gz vyos-cloud-init-a52691ec3a4ad6802597a214b2375cf438fe9fa0.zip | |
Renamed data source to CloudStack
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/examples/cloud-config-datasources.txt | 11 | ||||
| -rw-r--r-- | doc/examples/cloud-config.txt | 9 |
2 files changed, 20 insertions, 0 deletions
diff --git a/doc/examples/cloud-config-datasources.txt b/doc/examples/cloud-config-datasources.txt index b86c5ba6..b3a26114 100644 --- a/doc/examples/cloud-config-datasources.txt +++ b/doc/examples/cloud-config-datasources.txt @@ -13,3 +13,14 @@ datasource: metadata_urls: - http://169.254.169.254:80 - http://instance-data:8773 + + MaaS: + timeout : 50 + max_wait : 120 + + # there are no default values for metadata_url or oauth credentials + # If no credentials are present, non-authed attempts will be made. + metadata_url: http://mass-host.localdomain/source + consumer_key: Xh234sdkljf + token_key: kjfhgb3n + token_secret: 24uysdfx1w4 diff --git a/doc/examples/cloud-config.txt b/doc/examples/cloud-config.txt index 4f621274..171802cc 100644 --- a/doc/examples/cloud-config.txt +++ b/doc/examples/cloud-config.txt @@ -45,6 +45,15 @@ apt_mirror_search: # apt_proxy (configure Acquire::HTTP::Proxy) apt_proxy: http://my.apt.proxy:3128 +# apt_pipelining (configure Acquire::http::Pipeline-Depth) +# Default: disables HTTP pipelining. Certain web servers, such +# as S3 do not pipeline properly (LP: #948461). +# Valid options: +# False/default: Disables pipelining for APT +# None/Unchanged: Use OS default +# Number: Set pipelining to some number (not recommended) +apt_pipelining: False + # Preserve existing /etc/apt/sources.list # Default: overwrite sources_list with mirror. If this is true # then apt_mirror above will have no effect |