Merge pull request #5955 from EnterpriseDB/DOCS-947-tpa-23-34-update-and-release

TPA 23.34 update

Author: djw-m

product_docs/docs/tpa/23/INSTALL.mdx

@@ -97,12 +97,6 @@ curl -1sLf 'https://downloads.enterprisedb.com/<your-token>/<your-plan>/setup.de
 curl -1sLf 'https://downloads.enterprisedb.com/<your-token>/<your-plan>/setup.rpm.sh' | sudo -E bash
 ```
 
-Alternatively, you may obtain TPA from the legacy 2ndQuadrant
-repository. To do so, login to the EDB Customer Support Portal and
-subscribe to the ["products/tpa/release" repository](https://techsupport.enterprisedb.com/software_subscriptions/add/products/tpa/)
-by adding a subscription under Support/Software/Subscriptions,
-and following the instructions to enable the repository on your system.
-
 Once you have enabled one of these repositories, you may install TPA
 as follows:
 

product_docs/docs/tpa/23/architecture-BDR-Always-ON.mdx

@@ -8,10 +8,8 @@ originalFilePath: architecture-BDR-Always-ON.md
 EDB Postgres Distributed 3.7 or 4 in an Always-ON
 configuration, suitable for use in test and production.
 
-This architecture requires a subscription to the legacy 2ndQuadrant
-repositories, and some options require a subscription to EDB Repos 1.0.
-See [How TPA uses 2ndQuadrant and EDB repositories](reference/2q_and_edb_repositories/)
-for more detail on this topic.
+This architecture requires an EDB subscription. 
+All software will be sourced from [EDB Repos 2.0](reference/edb_repositories/).
 
 The BDR-Always-ON architecture has four variants, which can be
 selected with the `--layout` configure option:

product_docs/docs/tpa/23/architecture-M1.mdx

@@ -16,9 +16,8 @@ testing, demonstrating and learning due to its simplicity and ability to
 be configured with no proprietary components.
 
 If you select subscription-only EDB software with this architecture
-it will be sourced from EDB Repos 2.0 and you will need to provide a token.
-See [How TPA uses 2ndQuadrant and EDB repositories](reference/2q_and_edb_repositories/)
-for more detail on this topic.
+it will be sourced from EDB Repos 2.0 and you will need to 
+[provide a token](reference/edb_repositories/).
 
 ## Application and backup failover
 
@@ -69,11 +68,11 @@ More detail on the options is provided in the following section.
 
 #### Mandatory Options
 
-| Parameter                                                                                                        | Description                                                                                                                  |
-| ---------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------- |
-| `--architecture` (`-a`)                                                                                          | Must be set to `M1`.                                                                                                         |
-| Postgres flavour and version (e.g. `--postgresql 15`)                                                            | A valid [flavour and version specifier](tpaexec-configure/#postgres-flavour-and-version).                                    |
-| One of:  * `--failover-manager {efm, repmgr, patroni}` * `--enable-efm` * `--enable-repmgr` * `--enable-patroni` | Select the failover manager from [`efm`](reference/efm/), [`repmgr`](reference/repmgr/) and [`patroni`](reference/patroni/). |
+| Parameter                                                                                                      | Description                                                                                                                  |
+| -------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------- |
+| `--architecture` (`-a`)                                                                                        | Must be set to `M1`.                                                                                                         |
+| Postgres flavour and version (e.g. `--postgresql 15`)                                                          | A valid [flavour and version specifier](tpaexec-configure/#postgres-flavour-and-version).                                    |
+| One of:  - `--failover-manager {efm, repmgr, patroni}`- `--enable-efm` - `--enable-repmgr`- `--enable-patroni` | Select the failover manager from [`efm`](reference/efm/), [`repmgr`](reference/repmgr/) and [`patroni`](reference/patroni/). |
 
 <br/><br/>
 
@@ -90,6 +89,7 @@ More detail on the options is provided in the following section.
 | `--enable-haproxy`          | 2 additional nodes will be added as a load balancer layer.<br/>Only supported with Patroni as the failover manager.                                                                                                    | HAproxy nodes will not be added to the cluster.  |
 | `--enable-pgbouncer`        | PgBouncer will be configured in the Postgres nodes to pool connections for the primary.                                                                                                                                | PgBouncer will not be configured in the cluster. |
 | `--patroni-dcs`             | Select the Distributed Configuration Store backend for patroni.<br/>Only option is `etcd` at this time. <br/>Only supported with Patroni as the failover manager.                                                      | Defaults to `etcd`.                              |
+| `--efm-bind-by-hostname`    | Enable efm to use hostnames instead of IP addresses to configure the cluster `bind.address`.                                                                                                                           | Defaults to use IP addresses                     |
 
 <br/><br/>
 

product_docs/docs/tpa/23/architecture-PGD-Always-ON.mdx

@@ -5,11 +5,16 @@ originalFilePath: architecture-PGD-Always-ON.md
 
 ---
 
+!!! Note
+This architecture is for Postgres Distributed 5 only. 
+If you require PGD 4 or 3.7 please use [BDR-Always-ON](architecture-BDR-Always-ON/).
+!!!
+
 EDB Postgres Distributed 5 in an Always-ON configuration,
 suitable for use in test and production.
 
-This architecture is valid for use with EDB Postgres Distributed 5 only
-and requires a subscription to [EDB Repos 2.0](reference/2q_and_edb_repositories/).
+This architecture requires an EDB subscription. 
+All software will be sourced from [EDB Repos 2.0](reference/edb_repositories/).
 
 ## Cluster configuration
 
@@ -81,7 +86,8 @@ this definition makes sense to your use case. For example, AWS
 regions, your own data centres, or any other designation to identify
 where your servers are hosted.
 
-!!! Note for AWS users
+
+!!! Note Note for AWS users
 
     If you are using TPA to provision an AWS cluster, the locations will
     be mapped to separate availability zones within the `--region` you

product_docs/docs/tpa/23/configure-cluster.mdx

@@ -63,7 +63,7 @@ All
 options translate to config.yml variables in
 some way. A single option may affect several variables (e.g.,
 `--bdr-version` could set `postgres_version`,
-`tpa_2q_repositories`, `edb_repositories`, `extra_postgres_extensions`, and so on), but
+`edb_repositories`, `extra_postgres_extensions`, and so on), but
 you can always accomplish with an editor what you could by running the
 command.
 
@@ -112,9 +112,9 @@ be translated directly into group variables in the Ansible inventory:
 ```yaml
 cluster_vars:
   postgres_version: 14
-  tpa_2q_repositories:
-  - products/bdr3/release
-  - products/pglogical3/release
+  edb_repositories:
+  - enterprise
+  - postgres_distributed
   postgres_conf_settings:
     bdr.trace_replay: true
 ```

product_docs/docs/tpa/23/configure-instance.mdx

@@ -38,7 +38,7 @@ to execute tasks before any package repositories are configured.
 -   [Configure APT repositories](reference/apt_repositories/)
     (for Debian and Ubuntu)
 
--   [Configure 2ndQuadrant and EDB repositories](reference/2q_and_edb_repositories/)
+-   [Configure EDB repositories](reference/edb_repositories/)
     (on any system)
 
 -   [Configure a local package repository](reference/local-repo/)
@@ -120,11 +120,11 @@ cluster configuration with a minimum of effort.
 
 -   [Run initdb to create the PGDATA directory](reference/initdb/)
 
--   [Configure pg_hba.conf](reference/pg_hba_conf/)
+-   [Configure pg_hba.conf](reference/pg_hba.conf/)
 
--   [Configure pg_ident.conf](reference/pg_ident_conf/)
+-   [Configure pg_ident.conf](reference/pg_ident.conf/)
 
--   [Configure postgresql.conf](reference/postgresql_conf/)
+-   [Configure postgresql.conf](reference/postgresql.conf/)
 
 You can use the
 [postgres-config hook](tpaexec-hooks/#postgres-config)

product_docs/docs/tpa/23/reference/2q_and_edb_repositories.mdx

@@ -1,15 +1,24 @@
 ---
-description: How to configure EDB Repos 2.0 package repositories on any system.
+description: How to configure EDB Repos 2.0 package repositories.
 title: Configuring EDB Repos 2.0 repositories
 originalFilePath: edb_repositories.md
 
 ---
 
-This page explains how to configure EDB Repos 2.0 package repositories
-on any system.
+TPA sources EDB software from 
+[EDB Repos 2.0](https://www.enterprisedb.com/repos/). 
+To use EDB Repos 2.0 you must `export EDB_SUBSCRIPTION_TOKEN=xxx` 
+before you run tpaexec.
+You can get your subscription token from 
+[the web interface](https://www.enterprisedb.com/repos-downloads).
 
-For more details on the EDB and 2ndQuadrant package sources used by
-TPA see [this page](2q_and_edb_repositories/).
+!!!Note
+
+If you create your `config.yml` file using the `tpaexec configure`
+command, the `edb_repositories` key will be automatically populated with
+the necessary repositories for your selected configuration, so you 
+shouldn't need to edit it.
+!!!
 
 To specify the complete list of repositories from EDB Repos 2.0 to
 install on each instance, set `edb_repositories` to a list of EDB
@@ -22,16 +31,8 @@ cluster_vars:
     - postgres_distributed
 ```
 
-This example will install the enterprise subscription repository as well
-as postgres_distributed giving access to EPAS and PGD5 products.
+This example will install the 'enterprise' subscription repository as 
+well as 'postgres_distributed' giving access to EPAS and PGD products.
 On Debian or Ubuntu systems, it will use the APT repository and on
 RedHat or SLES systems, it will use the rpm repositories, through the yum
 or zypper frontends respectively.
-
-If any EDB repositories are specified, any 2ndQuadrant repositories
-specified will be ignored and no EDB Repos 1.0 will be installed.
-
-To use [EDB Repos 2.0](https://www.enterprisedb.com/repos/) you must
-`export EDB_SUBSCRIPTION_TOKEN=xxx` before you run tpaexec. You can get
-your subscription token from [the web
-interface](https://www.enterprisedb.com/repos-downloads).

product_docs/docs/tpa/23/reference/edb_repositories.mdx

@@ -17,7 +17,9 @@ TPA will generate `efm.nodes` and `efm.properties` with the appropriate
 instance-specific settings, with remaining settings set to the respective
 default values. TPA will also place an `efm.notification.sh` script which
 basically contains nothing by default and leaves it up to the user to fill it
-in however they want.
+in however they want. TPA will override the default settings for
+`auto.allow.hosts` and `stable.nodes.file` to simplify adding agents
+to the cluster.
 
 See the [EFM documentation](https://www.enterprisedb.com/docs/efm/latest/)
 for more details on EFM configuration.
@@ -31,11 +33,8 @@ would appear in `efm.properties`:
 ```yaml
 cluster_vars:
   efm_conf_settings:
-     standby.restart.delay: 1
-     application.name: quarry
-     reconfigure.num.sync: true
-     reconfigure.num.sync.max: 1
-     reconfigure.sync.primary: true
+     notification.level=WARNING
+     ping.server.ip=<well known address in network>
 ```
 
 If you make changes to values under `efm_conf_settings`, TPA will always

product_docs/docs/tpa/23/reference/efm.mdx

@@ -81,7 +81,7 @@ DCS config to be sent to the API and stored in the bootstrap section
 of the config file:
 
 -   TPA vars for `postgres` are loaded into the DCS settings,
-    see [postgresql.conf.md](postgresql_conf/).
+    see [postgresql.conf.md](postgresql.conf/).
     Some features are not supported, see notes below.
 -   Patroni defaults for DCS settings
 -   User supplied defaults in `patroni_dynamic_conf_settings`, if you want