aboutsummaryrefslogtreecommitdiff
path: root/doc/manila-guide.rst
diff options
context:
space:
mode:
authorMauricio Lima <mauriciolimab@gmail.com>2016-05-27 08:09:56 -0400
committerMauricio Lima <mauriciolimab@gmail.com>2016-05-27 08:10:43 -0400
commitbe2724a655185faae9abd57c8d07c12e48fd4aba (patch)
tree7d20aec01bdcab76acfeb130e319a091efa5bb4e /doc/manila-guide.rst
parentc51e315523fe37f28dc9b0968191b7e07125c24b (diff)
downloadkolla-be2724a655185faae9abd57c8d07c12e48fd4aba.tar.gz
kolla-be2724a655185faae9abd57c8d07c12e48fd4aba.zip
Update Documentation
Applying RST formatting conventions [1],[2] and [3] [1] http://docs.openstack.org/contributor-guide/rst-conv/gen-guidelines.html [2] http://docs.openstack.org/contributor-guide/rst-conv/inline-markups.html [3] http://docs.openstack.org/contributor-guide/rst-conv/lists.html Change-Id: I38b77a45d30ca0542058675dd1e8aba790c68567 Partially-implements: blueprint documentation-rework
Diffstat (limited to 'doc/manila-guide.rst')
-rw-r--r--doc/manila-guide.rst29
1 files changed, 15 insertions, 14 deletions
diff --git a/doc/manila-guide.rst b/doc/manila-guide.rst
index 1525925a7..f7c4a75f7 100644
--- a/doc/manila-guide.rst
+++ b/doc/manila-guide.rst
@@ -34,7 +34,7 @@ services are properly working.
Preparation and Deployment
==========================
-Cinder and Ceph are required, enable it in /etc/kolla/globals.yml:
+Cinder and Ceph are required, enable it in ``/etc/kolla/globals.yml``:
.. code-block:: console
@@ -47,13 +47,14 @@ Enable Manila in /etc/kolla/globals.yml:
enable_manila: "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 (using "nova
-flavor-create") or change service_instance_flavor_id to use one of the
-default nova flavor ids.
-Ex: service_instance_flavor_id = 2 to use nova default flavor m1.small.
+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*)
+or change *service_instance_flavor_id* to use one of the default nova flavor
+ids.
+Ex: *service_instance_flavor_id = 2* to use nova default flavor ``m1.small``.
-Create or modify the file /etc/kolla/config/manila.conf and add the contents:
+Create or modify the file ``/etc/kolla/config/manila-share.conf`` and add the
+contents:
.. code-block:: console
@@ -79,11 +80,11 @@ to verify successful launch of each process:
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 configuration, the share server is an instance where
-NFS/CIFS shares are served.
+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
+configuration, the share server is an instance where NFS/CIFS shares are
+served.
Determine the configuration of the share server
===============================================
@@ -166,8 +167,8 @@ Create a shared network
| description | None |
+-------------------+--------------------------------------+
-Create a flavor (Required if you not defined manila_instance_flavor_id in
-/etc/kolla/config/manila.conf file)
+Create a flavor (**Required** if you not defined *manila_instance_flavor_id* in
+``/etc/kolla/config/manila-share.conf`` file)
.. code-block:: console