Merge "Fix description of openstack-origin config opt"

This commit is contained in:
Jenkins 2017-08-28 15:05:52 +00:00 committed by Gerrit Code Review
commit 14fb69d915
1 changed files with 5 additions and 11 deletions

View File

@ -18,25 +18,19 @@ options:
description: |
Repository from which to install. May be one of the following:
distro (default), ppa:somecustom/ppa, a deb url sources entry,
or a supported Cloud Archive release pocket.
.
Supported Cloud Archive sources include:
or a supported Ubuntu Cloud Archive e.g.
.
cloud:<series>-<openstack-release>
cloud:<series>-<openstack-release>/updates
cloud:<series>-<openstack-release>/staging
cloud:<series>-<openstack-release>/proposed
.
For series=Precise we support cloud archives for openstack-release:
* icehouse
.
For series=Trusty we support cloud archives for openstack-release:
* juno
* kilo
* ...
See https://wiki.ubuntu.com/OpenStack/CloudArchive for info on which
cloud archives are available and supported.
.
NOTE: updating this setting to a source that is known to provide
a later version of OpenStack will trigger a software upgrade.
a later version of OpenStack will trigger a software upgrade unless
action-managed-upgrade is set to True.
openstack-origin-git:
type: string
default: