aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorKenny Johnston <kencjohnston@gmail.com>2016-07-25 22:00:05 -0500
committerKenny Johnston <kencjohnston@gmail.com>2016-07-25 22:00:05 -0500
commitba62df4fff7b64e0ebf7ddb5752cc464e5df6b60 (patch)
treed3127acc52eac9cf3b783afbab438672a7ce4df0 /doc
parenta06a57ba54d0956bcb09796f9c368703a3a468dd (diff)
downloadkolla-ba62df4fff7b64e0ebf7ddb5752cc464e5df6b60.tar.gz
kolla-ba62df4fff7b64e0ebf7ddb5752cc464e5df6b60.zip
Minor Readability Adjustments to Operating Kolla
Minor adjustments to operating-kolla.rst. Change-Id: If08e59cedb4a8d6e36db743f670288221e79b3c8
Diffstat (limited to 'doc')
-rw-r--r--doc/operating-kolla.rst24
1 files changed, 12 insertions, 12 deletions
diff --git a/doc/operating-kolla.rst b/doc/operating-kolla.rst
index ca30bcbea..cee9fe56a 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