[trivial] Cleanup config.yaml

Partially-Closes-Bug: 1473426
This commit is contained in:
Edward Hope-Morley 2015-07-10 15:14:18 +01:00
parent b1ecdda97d
commit a3f6410398

View File

@ -109,17 +109,17 @@ options:
default: default:
description: | description: |
Optional configuration to support use of additional sources such as: Optional configuration to support use of additional sources such as:
.
- ppa:myteam/ppa - ppa:myteam/ppa
- cloud:precise-proposed/icehouse - cloud:trusty-proposed/kilo
- http://my.archive.com/ubuntu main - http://my.archive.com/ubuntu main
.
The last option should be used in conjunction with the key configuration The last option should be used in conjunction with the key configuration
option. option.
.
Note that a minimum ceph version of 0.48.2 is required for use with this Note that a minimum ceph version of 0.48.2 is required for use with this
charm which is NOT provided by the packages in the main Ubuntu archive charm which is NOT provided by the packages in the main Ubuntu archive
for precise but is provided in the Folsom cloud archive. for precise but is provided in the Ubuntu cloud archive.
key: key:
type: string type: string
default: default:
@ -150,7 +150,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