From ea07cff8d7b57a6349d116a035a53021f98dea9f Mon Sep 17 00:00:00 2001
From: Tahlia Richardson <3069029+tahliar@users.noreply.github.com>
Date: Tue, 31 Oct 2023 14:34:19 +1000
Subject: [PATCH] Add site and location to glossary (#354)
* Clarify location terminology where appropriate
* Remove duplicate geo cluster entry from glossary
* Add site and location to glossary
jsc#DOCTEAM-108
* Geographic -> geographical to match the other uses in the guide
---
xml/art_sle_ha_geo_quick.xml | 11 +++++----
xml/art_sle_ha_install_quick.xml | 2 +-
xml/ha_config_basics.xml | 3 +--
xml/ha_glossary.xml | 39 ++++++++++++++++++++------------
xml/ha_loadbalancing.xml | 8 +++----
5 files changed, 36 insertions(+), 27 deletions(-)
diff --git a/xml/art_sle_ha_geo_quick.xml b/xml/art_sle_ha_geo_quick.xml
index a86978f56..9ad8b9643 100644
--- a/xml/art_sle_ha_geo_quick.xml
+++ b/xml/art_sle_ha_geo_quick.xml
@@ -123,8 +123,8 @@
You have at least two existing clusters that you want to combine into a
- &geo; cluster. (If you need to set up two clusters first, follow the
- instructions in the .
+ &geo; cluster (if you need to set up two clusters first, follow the
+ instructions in the ).
@@ -132,8 +132,9 @@
Meaningful Cluster Names
- Each cluster has a meaningful cluster name defined in &corosync.conf;
- that reflects its location.
+ Each cluster has a meaningful name that reflects its location,
+ for example: amsterdam and berlin.
+ Cluster names are defined in &corosync.conf;.
@@ -239,7 +240,7 @@
You can register to the &scc; and install the &hasi; while installing &sles;,
- or after installation. For more information, see the
+ or after installation. For more information, see
&deploy; for &sles;.
diff --git a/xml/art_sle_ha_install_quick.xml b/xml/art_sle_ha_install_quick.xml
index 28ff060a0..34d2302d4 100644
--- a/xml/art_sle_ha_install_quick.xml
+++ b/xml/art_sle_ha_install_quick.xml
@@ -277,7 +277,7 @@
Defines a name for the cluster, by default
hacluster. This
is optional and mostly useful for &geo; clusters. Usually, the cluster
- name reflects the location and makes it easier to distinguish a site
+ name reflects the geographical location and makes it easier to distinguish a site
inside a &geo; cluster.
diff --git a/xml/ha_config_basics.xml b/xml/ha_config_basics.xml
index be371a2c0..3f808f4ae 100644
--- a/xml/ha_config_basics.xml
+++ b/xml/ha_config_basics.xml
@@ -84,8 +84,7 @@
Usage scenario:Classic stretched clusters, focus on high availability of services
and local data redundancy. For databases and enterprise
- resource planning. One of the most popular setups during the last few
- years.
+ resource planning. One of the most popular setups.
diff --git a/xml/ha_glossary.xml b/xml/ha_glossary.xml
index 7e8c4c73a..0a7a4892b 100644
--- a/xml/ha_glossary.xml
+++ b/xml/ha_glossary.xml
@@ -84,7 +84,7 @@
- booth
+ booth
The instance that manages the failover process between the sites of a
@@ -152,6 +152,15 @@
+
+ cluster site
+
+
+ In &geo; clustering, a cluster site (or just site) is a group of
+ nodes in the same physical location, managed by .
+
+
+ cluster stack
@@ -297,11 +306,14 @@
- Geo cluster (geographically dispersed cluster)
+ &geo; cluster (geographically dispersed cluster)
- See .
- toms 2014-02-12: (from Phil): refer to new, common chapter
+ Consists of multiple, &geo.dispersed; sites with a local cluster
+ each. The sites communicate via IP. Failover across the sites is
+ coordinated by a higher-level entity, the booth. &geo; clusters need
+ to cope with limited network bandwidth and high latency. Storage is
+ replicated asynchronously.
@@ -332,6 +344,14 @@ performance will be met during a contractual measurement period.
+ location
+
+
+ In the context of a location constraint, location
+ refers to the nodes on which a resource can or cannot run.
+
+
+ LRM (local resource manager)
@@ -374,17 +394,6 @@ performance will be met during a contractual measurement period.
- &geo; cluster
-
-
- Consists of multiple, &geo.dispersed; sites with a local cluster
- each. The sites communicate via IP. Failover across the sites is
- coordinated by a higher-level entity, the booth. &geo; clusters need
- to cope with limited network bandwidth and high latency. Storage is
- replicated asynchronously.
-
-
- node
diff --git a/xml/ha_loadbalancing.xml b/xml/ha_loadbalancing.xml
index e4485159c..9e2e52eac 100644
--- a/xml/ha_loadbalancing.xml
+++ b/xml/ha_loadbalancing.xml
@@ -6,7 +6,7 @@
]>
-