From 80a6efb608603d10b083c9f147b24cc90f703bf5 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Mon, 18 Dec 2023 09:32:26 -0700 Subject: [PATCH] Fix up issues found in code revieww --- doc/ref/configuration/master.rst | 7 +++++-- doc/topics/highavailability/index.rst | 7 ++++--- doc/topics/tutorials/master-cluster.rst | 8 ++++---- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/doc/ref/configuration/master.rst b/doc/ref/configuration/master.rst index 48d1057639c..a1f0602cf93 100644 --- a/doc/ref/configuration/master.rst +++ b/doc/ref/configuration/master.rst @@ -201,7 +201,9 @@ following the Filesystem Hierarchy Standard (FHS) might set it to .. versionadded:: 3007 -When defined the master will operate in cluster mode. The master will send the cluster key and id to minions instead of it's own key and id. The master will also forward it's local event bus to other master defined by ``cluster_peers`` +When defined, the master will operate in cluster mode. The master will send the +cluster key and id to minions instead of it's own key and id. The master will +also forward it's local event bus to other masters defined by ``cluster_peers`` .. code-block:: yaml @@ -215,7 +217,8 @@ When defined the master will operate in cluster mode. The master will send the c .. versionadded:: 3007 -When ``cluster_id`` is defined. This setting is a list of other master (hostnames or ips) that will be in the cluster. +When ``cluster_id`` is defined. this setting is a list of other master +(hostnames or ips) that will be in the cluster. .. code-block:: yaml diff --git a/doc/topics/highavailability/index.rst b/doc/topics/highavailability/index.rst index 4f39dd598a6..f90ac7a208f 100644 --- a/doc/topics/highavailability/index.rst +++ b/doc/topics/highavailability/index.rst @@ -16,9 +16,10 @@ Master Cluster Salt masters can be configured to act as a cluster. All masters in a cluster are peers. Job workloads are shared accross the cluster. Master clusters -provide a way to scale masters horrizontally. They do not require changes to -the minions' configuration to add more resources. Cluster implimentations -expected to use a load balancer, shared filesystem, and reliable network. +provide a way to scale masters horizontally. They do not require changes to +the minions' configuration to add more resources. Cluster implementations are +expected to use a load balancer, shared filesystem, and run on areliable +network. :ref:`Master Cluster Tutorial ` diff --git a/doc/topics/tutorials/master-cluster.rst b/doc/topics/tutorials/master-cluster.rst index 7d7fc80ca00..10d4c949b99 100644 --- a/doc/topics/tutorials/master-cluster.rst +++ b/doc/topics/tutorials/master-cluster.rst @@ -19,15 +19,15 @@ Minimum Requirements Running a cluster master requires all nodes in the cluster to have a shared filesystem. The `cluster_pki_dir`, `cache_dir`, `file_roots` and `pillar_roots` -must all be on a shared filesystem. Most implimentations will also server the +must all be on a shared filesystem. Most implementations will also serve the masters publish and request server ports via a tcp load balancer. All of the masters in a cluster are assumed to be running on a reliable local area network. -Each master in a cluster maintains it's own public and private key, and an in +Each master in a cluster maintains its own public and private key, and an in memory aes key. Each cluster peer also has access to the `cluster_pki_dir` -where a cluster wide public and private key are stored. In addition the cluster -wide aes key is generated and stored in the `cluster_pki_dir`. In addition, +where a cluster wide public and private key are stored. In addition, the cluster +wide aes key is generated and stored in the `cluster_pki_dir`. Further, when operation as a cluster, minion keys are stored in the `cluster_pki_dir` instead of the master's `pki_dir`.