openstack
/
magnum
Code Issues Proposed changes

Merge "Document docker_volume_type option"

This commit is contained in:
Jenkins 2017-05-31 15:58:51 +00:00 committed by Gerrit Code Review
parent 98e4a181de 918f99b77a
commit 4fa996699e
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/source/userguide.rst
View File

@ -310,6 +310,8 @@ the table are linked to more details elsewhere in the user guide.
+---------------------------------------+--------------------+---------------+ +---------------------------------------+--------------------+---------------+
| `grafana_admin_passwd`_ | (any string) | "admin" | | `grafana_admin_passwd`_ | (any string) | "admin" |
+---------------------------------------+--------------------+---------------+ +---------------------------------------+--------------------+---------------+
| `docker_volume_type`_ | see below | see below |
+---------------------------------------+--------------------+---------------+
======= =======
Cluster Cluster
@ -2153,6 +2155,16 @@ size of the Cinder volume with the ClusterTemplate attribute
creation time, but future lifecycle operations may allow modifying the creation time, but future lifecycle operations may allow modifying the
block size during the life of the cluster. block size during the life of the cluster.
_`docker_volume_type`
For drivers that support additional volumes for container storage, a
label named 'docker_volume_type' is exposed so that users can select
different cinder volume types for their volumes. The default volume
*must* be set in 'default_docker_volume_type' in the 'cinder' section
of magnum.conf, an obvious value is the default volume type set in
cinder.conf of your cinder deployment . Please note, that
docker_volume_type refers to a cinder volume type and it is unrelated
to docker or kubernetes volumes.
Both local disk and the Cinder block storage can be used with a number Both local disk and the Cinder block storage can be used with a number
of Docker storage drivers available. of Docker storage drivers available.