summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiger <twatson@gitlab.com>2019-08-27 12:12:29 +1000
committerTiger <twatson@gitlab.com>2019-08-30 10:00:34 +1000
commit5816b21228e88e31bb32591941847a0827b5e969 (patch)
treed306b7e391ddea785773bfcb7fe859ebd91b2c63
parentd6b420baffef4ac0ca1684d7a0fc00d20f026644 (diff)
downloadgitlab-ce-ee-13811-db-load-balancing-support-aaaa-lookups.tar.gz
Update load balancing docs to include AAAA recordsee-13811-db-load-balancing-support-aaaa-lookups
-rw-r--r--doc/administration/database_load_balancing.md3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/administration/database_load_balancing.md b/doc/administration/database_load_balancing.md
index 64eca0b00f6..7e3263eea70 100644
--- a/doc/administration/database_load_balancing.md
+++ b/doc/administration/database_load_balancing.md
@@ -139,7 +139,7 @@ The following options can be set:
|----------------------|---------------------------------------------------------------------------------------------------|-----------|
| `nameserver` | The nameserver to use for looking up the DNS record. | localhost |
| `record` | The record to look up. This option is required for service discovery to work. | |
-| `record_type` | Optional record type to look up, this can be either A or SRV (since GitLab 12.3) | A |
+| `record_type` | Optional record type to look up ([Introduced][ee-13732] in GitLab 12.3). Valid values are A, AAAA, or SRV. | A |
| `port` | The port of the nameserver. | 8600 |
| `interval` | The minimum time in seconds between checking the DNS record. | 60 |
| `disconnect_timeout` | The time in seconds after which an old connection is closed, after the list of hosts was updated. | 120 |
@@ -279,4 +279,5 @@ production:
[db-req]: ../install/requirements.md#database
[ee-3526]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3526
[ee-5883]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5883
+[ee-13732]: https://gitlab.com/gitlab-org/gitlab-ee/issues/13732
[consul-udp]: https://www.consul.io/docs/agent/dns.html#udp-based-dns-queries