Commit d05d0351 authored by Richard Clamp's avatar Richard Clamp

Tweak consul.configuration.retry_join examples

In user information we introduce a new variable, CONSUL_SERVER_NODES,
to name this existing 'You need to know the addresses of the consul
servers' piece of information.  Then later in the example configuration
files we refer back to that variable.

https://gitlab.com/gitlab-org/build/team-tasks/issues/29
parent 0ddc1f7c
...@@ -77,8 +77,7 @@ Can be generated with: ...@@ -77,8 +77,7 @@ Can be generated with:
```sh ```sh
echo -n 'CONSUL_DATABASE_PASSWORDCONSUL_USERNAME' | md5sum echo -n 'CONSUL_DATABASE_PASSWORDCONSUL_USERNAME' | md5sum
``` ```
- You'll also need to supply the IP addresses or DNS records of Consul - `CONSUL_SERVER_NODES`. The IP addresses or DNS records of the Consul server nodes.
server nodes.
Few notes on the service itself: Few notes on the service itself:
...@@ -197,7 +196,7 @@ See `START user configuration` section in the next step for required information ...@@ -197,7 +196,7 @@ See `START user configuration` section in the next step for required information
# Replace placeholders: # Replace placeholders:
# #
# Y.Y.Y.Y consul1.gitlab.example.com Z.Z.Z.Z # Y.Y.Y.Y consul1.gitlab.example.com Z.Z.Z.Z
# with real information. # with the addresses gathered for CONSUL_SERVER_NODES
consul['configuration'] = { consul['configuration'] = {
server: true, server: true,
retry_join: %w(Y.Y.Y.Y consul1.gitlab.example.com Z.Z.Z.Z) retry_join: %w(Y.Y.Y.Y consul1.gitlab.example.com Z.Z.Z.Z)
...@@ -262,7 +261,7 @@ See `START user configuration` section in the next step for required information ...@@ -262,7 +261,7 @@ See `START user configuration` section in the next step for required information
# Replace placeholders: # Replace placeholders:
# #
# Y.Y.Y.Y consul1.gitlab.example.com Z.Z.Z.Z # Y.Y.Y.Y consul1.gitlab.example.com Z.Z.Z.Z
# with real information. # with the addresses gathered for CONSUL_SERVER_NODES
consul['configuration'] = { consul['configuration'] = {
retry_join: %w(Y.Y.Y.Y consul1.gitlab.example.com Z.Z.Z.Z) retry_join: %w(Y.Y.Y.Y consul1.gitlab.example.com Z.Z.Z.Z)
} }
...@@ -322,7 +321,7 @@ your configuration ...@@ -322,7 +321,7 @@ your configuration
# Replace placeholders: # Replace placeholders:
# #
# Y.Y.Y.Y consul1.gitlab.example.com Z.Z.Z.Z # Y.Y.Y.Y consul1.gitlab.example.com Z.Z.Z.Z
# with real information. # with the addresses gathered for CONSUL_SERVER_NODES
consul['configuration'] = { consul['configuration'] = {
retry_join: %w(Y.Y.Y.Y consul1.gitlab.example.com Z.Z.Z.Z) retry_join: %w(Y.Y.Y.Y consul1.gitlab.example.com Z.Z.Z.Z)
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment