Merge "Word choice for back end"

README.rst

@@ -127,10 +127,10 @@ Kolla provides images to deploy the following infrastructure components:
   scalable logging system for OpenStack services.
 - `MariaDB and Galera Cluster <https://mariadb.com/kb/en/mariadb/galera-cluster/>`__
   for highly available MySQL databases
-- `MongoDB <https://www.mongodb.org/>`__ as a database backend for Ceilometer
+- `MongoDB <https://www.mongodb.org/>`__ as a database back end for Ceilometer
   and Gnocchi
-- `Open vSwitch <http://openvswitch.org/>`__ and Linuxbridge backends for Neutron
-- `RabbitMQ <https://www.rabbitmq.com/>`__ as a messaging backend for
+- `Open vSwitch <http://openvswitch.org/>`__ and Linuxbridge back ends for Neutron
+- `RabbitMQ <https://www.rabbitmq.com/>`__ as a messaging back end for
   communication between services.
 
 Directories

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)

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:
 

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.
 

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.
 

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

docker/ceilometer/ceilometer-api/extend_start.sh

@@ -8,7 +8,7 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
     elif [[ "${CEILOMETER_DATABASE_TYPE}" == "gnocchi" ]]; then
         sudo -H -u ceilometer ceilometer-upgrade --skip-metering-database --skip-event-database
     elif [[ "${CEILOMETER_DATABASE_TYPE}" == "mongodb" ]]; then
-        echo "Ceilometer doesn't need to initialize a database when MongoDB is configured as the database backend."
+        echo "Ceilometer doesn't need to initialize a database when MongoDB is configured as the database back end."
     else
         echo "Unsupported database type: ${CEILOMETER_DATABASE_TYPE}"
         exit 1

etc/kolla/globals.yml

@@ -191,7 +191,7 @@ kolla_internal_vip_address: "10.10.10.254"
 #########################
 # Glance - Image Options
 #########################
-# Configure image backend.
+# Configure image back end.
 #glance_backend_file: "yes"
 #glance_backend_ceph: "no"
 

specs/high-availability.rst

@@ -141,9 +141,9 @@ provide network high-availability for tenant networks.
 
 [Multiple L3/DHCP Agents]: https://wiki.openstack.org/wiki/Neutron/L3_High_Availability_VRRP
 
-Glance: Glance can use different back-ends to store OpenStack images. Examples
-include Swift, Ceph, Cinder and the default filesystem back-end. Although
-it is not required, it is highly recommended to use a backend that is highly
+Glance: Glance can use different back ends to store OpenStack images. Examples
+include Swift, Ceph, Cinder and the default filesystem back end. Although
+it is not required, it is highly recommended to use a back end that is highly
 scalable and fault-tolerant.
 
 Just as with the rest of the OpenStack API's, HAProxy and Keepalived can
@@ -162,9 +162,9 @@ hashes and shared high water marks.
 Cinder: As with other stateless services, HAProxy can provide high
 availability and scalability to cinder-api. RabbitMQ clustering and mirrored
 queues can provide high-availability and scalability for RPC messaging among
-Cinder services. At the time of this writing, the only Cinder backend
+Cinder services. At the time of this writing, the only Cinder back end
 supported is LVM. LVM can be made [highly-available][] or a new Cinder
-backend, such as [Ceph][], can be added to Kolla which supports high
+back end, such as [Ceph][], can be added to Kolla which supports high
 availability and scalability for tenant-facing block storage services.
 Due to limitations described [here][], the Cinder volume manager can
 not be reliably deployed in an active/active or active/passive fashion.
@@ -261,7 +261,7 @@ Work Items
 4. Add clustering/mirrored queue support to RabbitMQ container set.
 5. Add L3/DHCP agent HA to existing Neutron agent container set.
 6. Create Swift containers.
-7. Add/configure the Glance backend to support HA and scalability.
+7. Add/configure the Glance back end to support HA and scalability.
 8. Add/configure HAproxy for services, like keystone or horizon.
 
 Testing