[trivial] Cleanup config.yaml

Partially-Closes-Bug: 1473426
This commit is contained in:
Edward Hope-Morley 2015-07-10 15:18:48 +01:00
parent 4f9204bb69
commit f62f2cdca9
1 changed files with 23 additions and 16 deletions

View File

@ -7,9 +7,7 @@ options:
type: boolean type: boolean
default: False default: False
description: | description: |
By default, all services will log into their corresponding log Setting this to True will allow supporting services to log to syslog.
files. Setting this to True will force all services to log to the
syslog.
openstack-origin: openstack-origin:
default: distro default: distro
type: string type: string
@ -18,17 +16,27 @@ options:
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.
Note that updating this setting to a source that is known to cloud:<series>-<openstack-release>
provide a later version of OpenStack will trigger a software cloud:<series>-<openstack-release>/updates
upgrade. cloud:<series>-<openstack-release>/staging
cloud:<series>-<openstack-release>/proposed
Note that when openstack-origin-git is specified, openstack For series=Precise we support cloud archives for openstack-release:
specific packages will be installed from source rather than * icehouse
from the openstack-origin repository.
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.
NOTE: when openstack-origin-git is specified, openstack specific
packages will be installed from source rather than from the
openstack-origin repository.
openstack-origin-git: openstack-origin-git:
default: default:
type: string type: string
@ -88,10 +96,9 @@ options:
default: default:
description: | description: |
Base64-encoded SSL certificate to install and use for Horizon. Base64-encoded SSL certificate to install and use for Horizon.
.
juju set openstack-dashbaord ssl_cert="$(cat cert| base64)" \ juju set openstack-dashbaord ssl_cert="$(cat cert| base64)" \
ssl_key="$(cat key| base64)" ssl_key="$(cat key| base64)"
.
ssl_key: ssl_key:
type: string type: string
default: default: