aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-10-14 16:43:52 +0000
committerGerrit Code Review <review@openstack.org>2016-10-14 16:43:52 +0000
commitb473da2348a94a0d8622d5847ee303222258f36a (patch)
tree13abde0057a69b47d3ad18906113be4de99883d9
parentd73615a1a7ea7ff16e4c437a5baebc4b9dc3d9d7 (diff)
parent7bc185a55e71e0a998f1886244890c333c214d84 (diff)
downloadkolla-b473da2348a94a0d8622d5847ee303222258f36a.tar.gz
kolla-b473da2348a94a0d8622d5847ee303222258f36a.zip
Merge "Update Manila Guide"
-rw-r--r--doc/manila-guide.rst5
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/manila-guide.rst b/doc/manila-guide.rst
index 625c8b7f5..12090431d 100644
--- a/doc/manila-guide.rst
+++ b/doc/manila-guide.rst
@@ -41,11 +41,12 @@ Cinder and Ceph are required, enable it in ``/etc/kolla/globals.yml``:
enable_cinder: "yes"
enable_ceph: "yes"
-Enable Manila in ``/etc/kolla/globals.yml``:
+Enable Manila and generic backend in ``/etc/kolla/globals.yml``:
.. code-block:: console
enable_manila: "yes"
+ enable_manila_backend_generic: "yes"
By default Manila uses instance flavor id 100 for its file systems. For Manila
to work, either create a new nova flavor with id 100 (use *nova flavor-create*)
@@ -82,7 +83,7 @@ Launch an Instance
Before being able to create a share, the manila with the generic driver and the
DHSS mode enabled requires the definition of at least an image, a network and a
-share-network for being used to create a share server. For that back end
+share-network for being used to create a share server. For that backend
configuration, the share server is an instance where NFS/CIFS shares are
served.