diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-14 14:08:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-14 14:08:10 +0000 |
| commit | 1f899e1c99a90abcc1e024afd5577d1edfdff959 (patch) | |
| tree | daeed7c97a186b06e85dae3084e1cbc6279607f4 | |
| parent | c2e578b3759a57054850853a040d79f3c1770e81 (diff) | |
| parent | ba62df4fff7b64e0ebf7ddb5752cc464e5df6b60 (diff) | |
| download | kolla-1f899e1c99a90abcc1e024afd5577d1edfdff959.tar.gz kolla-1f899e1c99a90abcc1e024afd5577d1edfdff959.zip | |
Merge "Minor Readability Adjustments to Operating Kolla"
| -rw-r--r-- | doc/operating-kolla.rst | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/doc/operating-kolla.rst b/doc/operating-kolla.rst index 1ba05d0f4..e8dfdf49c 100644 --- a/doc/operating-kolla.rst +++ b/doc/operating-kolla.rst @@ -6,9 +6,9 @@ Operating Kolla Upgrading ========= -Kolla's strategy for upgrades is to never make a mess and follow consistent -patterns during deployment such that upgrades from one environment to -the next are simple to automate. +Kolla's strategy for upgrades is to never make a mess and to follow consistent +patterns during deployment such that upgrades from one environment to the next +are simple to automate. Kolla implements a one command operation for upgrading an existing deployment consisting of a set of containers and configuration data to a new deployment. @@ -16,15 +16,15 @@ consisting of a set of containers and configuration data to a new deployment. Kolla uses the ``x.y.z`` semver nomenclature for naming versions. Kolla's Liberty version is ``1.0.0`` and the Mitaka version is ``2.0.0``. The Kolla community commits to release z-stream updates every 45 days that resolve -defects in the stable version in use and publish those images to the -Docker Hub registry. To prevent confusion, the Kolla community recommends -using an alpha identifier ``x.y.z.a`` where ``a`` represents any customization -done on the part of the operator. For example, if an operator intends -to modify one of the Docker files or the repos from where the originals and -build custom images and using Liberty, the operator should start with -version 1.0.0.0 and increase alpha for each release. Alpha tag usage is -at discretion of the operator. The alpha identifier could be a number as -recommended or a string of the operator's choosing. +defects in the stable version in use and publish those images to the Docker Hub +registry. To prevent confusion, the Kolla community recommends using an alpha +identifier ``x.y.z.a`` where ``a`` represents any customization done on the +part of the operator. For example, if an operator intends to modify one of the +Docker files or the repos from the originals and build custom images for the +Liberty version, the operator should start with version 1.0.0.0 and increase +alpha for each release. Alpha tag usage is at discretion of the operator. The +alpha identifier could be a number as recommended or a string of the operator's +choosing. If the alpha identifier is not used, Kolla will deploy or upgrade using the version number information contained in the release. To customize the |