From 0f664d098f40978d29d274fc39c81f0589993f37 Mon Sep 17 00:00:00 2001 From: Frank Schroeder Date: Wed, 4 Oct 2017 10:38:46 +0200 Subject: [PATCH] doc: drop last references to -retry-join-* options --- website/source/docs/faq.html.md | 15 ++++++++------- website/source/docs/guides/bootstrapping.html.md | 4 +--- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/website/source/docs/faq.html.md b/website/source/docs/faq.html.md index 5411f098f..c8ff22641 100644 --- a/website/source/docs/faq.html.md +++ b/website/source/docs/faq.html.md @@ -25,15 +25,16 @@ Hosted Consul Enterprise in Atlas was officially deprecated on March 7th, There are strong alternatives available and they are listed below. -For users on AWS the [-retry-join-ec2 configuration options](/docs/agent/options.html#_retry_join_ec2_tag_key) allow bootstrapping by automatically discovering AWS instances with a given tag key/value at startup. +For users on supported cloud platform the +[-retry-join](/docs/agent/options.html#_retry_join) option allows bootstrapping +by automatically discovering instances with a given tag key/value at startup. -For users on GCE the [-retry-join-gce configuration options](/docs/agent/options.html#_retry_join_gce_tag_value) allow bootstrapping by automatically discovering instances on Google Compute Engine by tag value at startup. +For users on other cloud platforms [-join and retry-join +functionality](/docs/agent/options.html#_join) can be used to join clusters by +ip address or hostname. -For users on Azure the [-retry-join-azure configuration options](/docs/agent/options.html#_retry_join_azure_tag_name) allow bootstrapping by automatically discovering Azure instances with a given tag name/value at startup. - -For users not on AWS, GCE or Azure the native [-join and retry-join functionality](/docs/agent/options.html#_join) can be used. - -Other features of Consul Enterprise, such as the UI and Alerts also have suitable open source alternatives. +Other features of Consul Enterprise, such as the UI and Alerts also have +suitable open source alternatives. For replacing the UI, we recommend the [free UI packaged as part of Consul open source](https://www.consul.io/docs/agent/options.html#_ui). A live demo can be access at [https://demo.consul.io/ui/](https://demo.consul.io/ui/). diff --git a/website/source/docs/guides/bootstrapping.html.md b/website/source/docs/guides/bootstrapping.html.md index 1392ec222..6f98a8ca2 100644 --- a/website/source/docs/guides/bootstrapping.html.md +++ b/website/source/docs/guides/bootstrapping.html.md @@ -47,9 +47,7 @@ To trigger leader election, we must join these machines together and create a cl [start_join](https://www.consul.io/docs/agent/options.html#start_join) options - Manually specified list of machines with [-retry-join](https://www.consul.io/docs/agent/options.html#_retry_join) option -- Automatic AWS EC2 instance joining with the [-retry-join-ec2-*](https://www.consul.io/docs/agent/options.html#_retry_join_ec2_tag_key) options -- Automatic GCE instance joining with the [-retry-join-gce-*](https://www.consul.io/docs/agent/options.html#_retry_join_gce_tag_value) options -- Automatic Azure instance joining with the [-retry-join-azure-*](https://www.consul.io/docs/agent/options.html#_retry_join_azure_tag_name) options +- Automatic joining by tag for supported cloud environments with the [-retry-join](https://www.consul.io/docs/agent/options.html#_retry_join) option Choose the method which best suits your environment and specific use case.