[glossary] Consolidate project codenames [glance]

- Combine "Image service" entry with "glance" entry
  - Rename "Image service" to "Image service (glance)"
  - Link "glance" to "Image service (glance)"
  - Make sure description matches project.yaml
- Remove the duplicate entry Image API, keep Image server API
  - Link "Glance API server" to "Image API"
- Combine Image registry entry with "glance registry"

Change-Id: I37cc324cf6783d13a4bcefb8cb1e8043d4732365
Implements: bp improve-glossary-usage

doc/arch-design/source/compute-focus-technical-considerations.rst

@@ -178,7 +178,7 @@ includes the typical OpenStack components:
 
 * :term:`Compute service (nova)`
 
-* :term:`Image service` (glance)
+* :term:`Image service (glance)`
 
 * :term:`Identity service (keystone)`
 

doc/arch-design/source/generalpurpose-technical-considerations.rst

@@ -348,7 +348,7 @@ OpenStack core services recommended in a general purpose cloud are:
 
 * :term:`Networking service (neutron)`
 
-* :term:`Image service` (:term:`glance`)
+* :term:`Image service (glance)`
 
 * :term:`Identity service (keystone)`
 

doc/common/glossary.rst

@@ -1582,17 +1582,15 @@ G
 
    glance
 
-      A core project that provides the OpenStack Image service.
+      Codename for the :term:`Image service<Image service (glance)>`.
 
    glance API server
 
-      Processes client requests for VMs, updates Image service
-      metadata on the registry server, and communicates with the store
-      adapter to upload VM images from the back-end store.
+      Alternative name for the :term:`Image API`.
 
    glance registry
 
-      Alternative term for the Image service image registry.
+      Alternative term for the Image service :term:`image registry`.
 
    global endpoint template
 
@@ -1839,6 +1837,9 @@ I
 
       The Image service API endpoint for management of VM
       images.
+      Processes client requests for VMs, updates Image service
+      metadata on the registry server, and communicates with the store
+      adapter to upload VM images from the back-end store.
 
    image cache
 
@@ -1866,15 +1867,12 @@ I
       A list of VM images that are available through Image
       service.
 
-   Image service
+   Image service (glance)
 
-      An OpenStack core project that provides discovery, registration,
-      and delivery services for disk and server images. The project name of
-      the Image service is glance.
-
-   Image service API
-
-      Alternative name for the glance image API.
+      The OpenStack service that provide services and associated libraries
+      to store, browse, share, distribute and manage bootable disk images,
+      other data closely associated with initializing compute resources,
+      and metadata definitions.
 
    image status
 

doc/ops-guide/source/arch-example-nova-network.rst

@@ -149,7 +149,7 @@ the distributed file system.
 
 Acknowledging that many small-scale deployments see running Object
 Storage just for the storage of virtual machine images as too costly, we
-opted for the file back end in the OpenStack :term:`Image service` (Glance).
+opted for the file back end in the OpenStack :term:`Image service (Glance)`.
 If your cloud will include Object Storage, you can easily add it as a back
 end.
 

doc/ops-guide/source/ops-maintenance-slow.rst

@@ -27,9 +27,9 @@ in :ref:`sql_backend`.
 OpenStack Image service
 ~~~~~~~~~~~~~~~~~~~~~~~
 
-OpenStack :term:`Image service` can be slowed down by things related to the
-Identity service, but the Image service itself can be slowed down if
-connectivity to the back-end storage in use is slow or otherwise
+OpenStack :term:`Image service <Image service (glance)>` can be slowed down
+by things related to the Identity service, but the Image service itself can be
+slowed down if connectivity to the back-end storage in use is slow or otherwise
 problematic. For example, your back-end NFS server might have gone down.
 
 OpenStack Block Storage service