diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/cinder-guide.rst | 8 | ||||
| -rw-r--r-- | doc/external-ceph-guide.rst | 4 | ||||
| -rw-r--r-- | doc/image-building.rst | 2 | ||||
| -rw-r--r-- | doc/manila-guide.rst | 4 | ||||
| -rw-r--r-- | doc/quickstart.rst | 6 |
5 files changed, 12 insertions, 12 deletions
diff --git a/doc/cinder-guide.rst b/doc/cinder-guide.rst index 398d80d2d..5b3b08342 100644 --- a/doc/cinder-guide.rst +++ b/doc/cinder-guide.rst @@ -86,16 +86,16 @@ A ``/dev/vdb`` should appear in the console log, at least when booting cirros. If the disk stays in the available state, something went wrong during the iSCSI mounting of the volume to the guest VM. -Cinder LVM2 backend with iSCSI +Cinder LVM2 back end with iSCSI ============================== -As of Newton-1 milestone, Kolla supports LVM2 as cinder backend. It is +As of Newton-1 milestone, Kolla supports LVM2 as cinder back end. It is accomplished by introducing two new containers ``tgtd`` and ``iscsid``. ``tgtd`` container serves as a bridge between cinder-volume process and a server hosting Logical Volume Groups (LVG). ``iscsid`` container serves as a bridge between nova-compute process and the server hosting LVG. -In order to use Cinder's LVM backend, a LVG named ``cinder-volumes`` should +In order to use Cinder's LVM back end, a LVG named ``cinder-volumes`` should exist on the server and following parameter must be specified in ``globals.yml`` :: @@ -127,7 +127,7 @@ targeted for nova compute role. mount -t configfs /etc/rc.local /sys/kernel/config -Cinder backend with external iSCSI storage +Cinder back end with external iSCSI storage ========================================== In order to use external storage system (like one from EMC or NetApp) diff --git a/doc/external-ceph-guide.rst b/doc/external-ceph-guide.rst index 12f7ad7d2..14c825336 100644 --- a/doc/external-ceph-guide.rst +++ b/doc/external-ceph-guide.rst @@ -47,7 +47,7 @@ Glance Configuring Glance for Ceph includes three steps: -1) Configure RBD backend in glance-api.conf +1) Configure RBD back end in glance-api.conf 2) Create Ceph configuration file in /etc/ceph/ceph.conf 3) Create Ceph keyring file in /etc/ceph/ceph.client.<username>.keyring @@ -166,7 +166,7 @@ Put ceph.conf and keyring file into ``/etc/kolla/config/nova``: $ ls /etc/kolla/config/nova ceph.client.nova.keyring ceph.conf -Configure nova-compute to use Ceph as the ephemeral backend by creating +Configure nova-compute to use Ceph as the ephemeral back end by creating ``/etc/kolla/config/nova/nova-compute.conf`` and adding the following contents: diff --git a/doc/image-building.rst b/doc/image-building.rst index 96a14e07a..13df89bbe 100644 --- a/doc/image-building.rst +++ b/doc/image-building.rst @@ -343,7 +343,7 @@ Known issues avoid the issue is that add ``-s devicemapper`` or ``-s btrfs`` to ``DOCKER_OPTS``. Get more information about `the issue from the Docker bug tracker <https://github.com/docker/docker/issues/6980>`_ and `how to - configure Docker with BTRFS backend <https://docs.docker.com/engine/userguide/storagedriver/btrfs-driver/#prerequisites>`_. + configure Docker with BTRFS back end <https://docs.docker.com/engine/userguide/storagedriver/btrfs-driver/#prerequisites>`_. #. Mirrors are unreliable. diff --git a/doc/manila-guide.rst b/doc/manila-guide.rst index 1f4bc0979..8db7c9e03 100644 --- a/doc/manila-guide.rst +++ b/doc/manila-guide.rst @@ -41,7 +41,7 @@ Cinder and Ceph are required, enable it in ``/etc/kolla/globals.yml``: enable_cinder: "yes" enable_ceph: "yes" -Enable Manila and generic backend in ``/etc/kolla/globals.yml``: +Enable Manila and generic back end in ``/etc/kolla/globals.yml``: .. code-block:: console @@ -83,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 backend +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. diff --git a/doc/quickstart.rst b/doc/quickstart.rst index 7b33d0504..376290a68 100644 --- a/doc/quickstart.rst +++ b/doc/quickstart.rst @@ -65,7 +65,7 @@ to add .xz compressed format support. Ubuntu: For Ubuntu based systems where Docker is used it is recommended to use the latest available LTS kernel. The latest LTS kernel available is the wily kernel (version 4.2). While all kernels should work for Docker, some older -kernels may have issues with some of the different Docker backends such as AUFS +kernels may have issues with some of the different Docker back ends such as AUFS and OverlayFS. In order to update kernel in Ubuntu 14.04 LTS to 4.2, run: :: @@ -191,8 +191,8 @@ For mounting ``/run`` as shared upon startup, add that command to # Edit /etc/rc.local to add: mount --make-shared /run -.. note:: If centos/oraclelinux container images are built on an Ubuntu - host, the backend storage driver must not be AUFS (see the known issues in +.. note:: If centos/fedora/oraclelinux container images are built on an Ubuntu + host, the back-end storage driver must not be AUFS (see the known issues in :doc:`image-building`). .. note:: On ubuntu 16.04, please uninstall ``lxd`` and ``lxc`` packages. (issue |