openstack
/
magnum
Code Issues Proposed changes

Document use of kube_tag label 

Explain how to select a specific Kubernetes version by specifying the
kube_tag label.

In the process, also backport the documentation for
kube_dashboard_enabled (original change
I4c322beea84370dcd9544c8602011183be602f1e, commit
7de5264c95).

In addition, fix an unrelated whitespace error in
specs/containers-service.rst which would cause tox -e docs to fail.

Change-Id: Ieff1474b74e0b1595c05d945b69bec16bfef9c3b
(cherry-picked from 11e7f330fb)
This commit is contained in:
Florian Haas 2018-02-13 13:26:22 +01:00
parent a342f92062
commit 6d9914de87
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
doc/source/user/index.rst
View File

@ -338,6 +338,11 @@ the table are linked to more details elsewhere in the user guide.
+---------------------------------------+--------------------+---------------+
| `grafana_admin_passwd`_ | (any string) | "admin" |
+---------------------------------------+--------------------+---------------+
| `kube_tag`_ | see below | see below |
+---------------------------------------+--------------------+---------------+
| `kube_dashboard_enabled`_ | - true | true |
| | - false | |
+---------------------------------------+--------------------+---------------+
| `docker_volume_type`_ | see below | see below |
+---------------------------------------+--------------------+---------------+
| `etcd_volume_size`_ | etcd storage | 0 |
@ -1082,6 +1087,17 @@ _`etcd_volume_size`
This label sets the size of a volume holding the etcd storage data.
The default value is 0, meaning the etcd data is not persisted (no volume).
_`kube_tag`
This label allows users to select `a specific Kubernetes release,
based on its container tag
<https://hub.docker.com/r/openstackmagnum/kubernetes-apiserver/tags/>`_.
If unset, the current Magnum version's default Kubernetes release is
installed.
_`kube_dashboard_enabled`
This label triggers the deployment of the kubernetes dashboard.
The default value is 1, meaning it will be enabled.
External load balancer for services
-----------------------------------

2
specs/containers-service.rst
View File

@ -175,7 +175,7 @@ with the Containers Service, and can be controlled only by a Nova virt driver.
|           +-------+ |  | +-----+                   |
|                     |  |                           |
+-----------+---------+  +---------------+-----------+
            |                            |            
            |                            |
+-----------+----+ Compute Host ---------|-----------+
|                                    +---+---+       |
|                               +----+ Relay +---+   |