[trivial] Cleanup config.yaml

Partially-Closes-Bug: 1473426
This commit is contained in:
Edward Hope-Morley 2015-07-10 15:13:35 +01:00
parent d98f668fa2
commit 7cd7571364

View File

@ -6,14 +6,24 @@ options:
Repository from which to install. May be one of the following: Repository from which to install. May be one of the following:
distro (default), ppa:somecustom/ppa, a deb url sources entry, distro (default), ppa:somecustom/ppa, a deb url sources entry,
or a supported Cloud Archive release pocket. or a supported Cloud Archive release pocket.
.
Supported Cloud Archive sources include: cloud:precise-folsom, Supported Cloud Archive sources include:
cloud:precise-folsom/updates, cloud:precise-folsom/staging,
cloud:precise-folsom/proposed. cloud:<series>-<openstack-release>
. cloud:<series>-<openstack-release>/updates
Note that updating this setting to a source that is known to cloud:<series>-<openstack-release>/staging
provide a later version of OpenStack will trigger a software cloud:<series>-<openstack-release>/proposed
upgrade.
For series=Precise we support cloud archives for openstack-release:
* icehouse
For series=Trusty we support cloud archives for openstack-release:
* juno
* kilo
* ...
NOTE: updating this setting to a source that is known to provide
a later version of OpenStack will trigger a software upgrade.
block-device: block-device:
default: sdb default: sdb
type: string type: string
@ -70,7 +80,7 @@ options:
If True enables IPv6 support. The charm will expect network interfaces If True enables IPv6 support. The charm will expect network interfaces
to be configured with an IPv6 address. If set to False (default) IPv4 to be configured with an IPv6 address. If set to False (default) IPv4
is expected. is expected.
.
NOTE: these charms do not currently support IPv6 privacy extension. In NOTE: these charms do not currently support IPv6 privacy extension. In
order for this charm to function correctly, the privacy extension must be order for this charm to function correctly, the privacy extension must be
disabled and a non-temporary address must be configured/available on disabled and a non-temporary address must be configured/available on