Merge "Fix doc build warnings so docs build clean"

This commit is contained in:
Jenkins 2014-10-14 15:49:45 +00:00 committed by Gerrit Code Review
commit 7d928b5956
3 changed files with 7 additions and 2 deletions

View File

@ -34,6 +34,7 @@ see: https://wiki.openstack.org/wiki/Manila/Networking
One of two possible configurations can be chosen for share provisioning
using 'service_instance' module:
- Service VM has one net interface from net that is connected to public router.
For successful creation of share, user network should be connected to public
router too.
@ -51,6 +52,7 @@ Requirements for service image
- 'exportfs' and 'net conf' libraries used for share actions
- Following files will be used, so if their paths differ one needs to create at
least symlinks for them:
* /etc/exports (permanent file with NFS exports)
* /var/lib/nfs/etab (temporary file with NFS exports used by 'exportfs')
* /etc/fstab (permanent file with mounted filesystems)

View File

@ -449,6 +449,8 @@ class NaElement(object):
def translate_struct(self, data_struct):
"""Convert list, tuple, dict to NaElement and appends.
::
Example usage:
1.
<root>

View File

@ -101,11 +101,12 @@ class ServiceInstanceManager(object):
"""Manages nova instances for various share drivers.
This class provides two external methods:
1. set_up_service_instance: creates instance and sets up share
infrastructure
infrastructure.
2. ensure_service_instance: ensure service instance is available.
3. delete_service_instance: removes service instance and network
infrastructure.
infrastructure.
"""
def get_config_option(self, key):