From 158fb03b0b7f30b960317a408a7b0ee0cfef0c73 Mon Sep 17 00:00:00 2001 From: Nathan Jones Date: Thu, 26 Jul 2018 11:27:36 -0400 Subject: [PATCH 1/4] DTR LB config link Updated article with note about DTR LB requirements. This tripped up a customer on SR# 50917. --- ee/ucp/admin/configure/join-nodes/use-a-load-balancer.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ee/ucp/admin/configure/join-nodes/use-a-load-balancer.md b/ee/ucp/admin/configure/join-nodes/use-a-load-balancer.md index e3ca9506da7..6a27c52a5e4 100644 --- a/ee/ucp/admin/configure/join-nodes/use-a-load-balancer.md +++ b/ee/ucp/admin/configure/join-nodes/use-a-load-balancer.md @@ -34,6 +34,8 @@ or port number. * Use the same load balancer with multiple virtual IPs. * Configure your load balancer to expose UCP or DTR on a port other than 443. +> **Note:** In addition to configuring your load balancer to distinguish between UCP and DTR, configuring a load balancer for DTR has [additional requirements](https://docs.docker.com/ee/dtr/admin/configure/use-a-load-balancer/#load-balance-dtr). + ## Configuration examples Use the following examples to configure your load balancer for UCP. From 98dc4146ad588ea18afdb70e7521c3e4808c96dd Mon Sep 17 00:00:00 2001 From: Anne Henmi <41210220+ahh-docker@users.noreply.github.com> Date: Fri, 3 Aug 2018 14:03:27 -0600 Subject: [PATCH 2/4] Update use-a-load-balancer.md Fixed the admonition to important since notes are deprecated. --- ee/ucp/admin/configure/join-nodes/use-a-load-balancer.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ee/ucp/admin/configure/join-nodes/use-a-load-balancer.md b/ee/ucp/admin/configure/join-nodes/use-a-load-balancer.md index 6a27c52a5e4..c9f753807b2 100644 --- a/ee/ucp/admin/configure/join-nodes/use-a-load-balancer.md +++ b/ee/ucp/admin/configure/join-nodes/use-a-load-balancer.md @@ -34,7 +34,9 @@ or port number. * Use the same load balancer with multiple virtual IPs. * Configure your load balancer to expose UCP or DTR on a port other than 443. -> **Note:** In addition to configuring your load balancer to distinguish between UCP and DTR, configuring a load balancer for DTR has [additional requirements](https://docs.docker.com/ee/dtr/admin/configure/use-a-load-balancer/#load-balance-dtr). +> In addition to configuring your load balancer to distinguish between UCP and DTR, configuring a load balancer for DTR +> has [additional requirements](https://docs.docker.com/ee/dtr/admin/configure/use-a-load-balancer/#load-balance-dtr). +{: .important} ## Configuration examples From b88916ee70c87d09f3516bd9c5233a2af6f21b75 Mon Sep 17 00:00:00 2001 From: Anne Henmi <41210220+ahh-docker@users.noreply.github.com> Date: Fri, 3 Aug 2018 14:15:27 -0600 Subject: [PATCH 3/4] Added title --- ee/ucp/admin/configure/join-nodes/use-a-load-balancer.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ee/ucp/admin/configure/join-nodes/use-a-load-balancer.md b/ee/ucp/admin/configure/join-nodes/use-a-load-balancer.md index c9f753807b2..962bc1c3f98 100644 --- a/ee/ucp/admin/configure/join-nodes/use-a-load-balancer.md +++ b/ee/ucp/admin/configure/join-nodes/use-a-load-balancer.md @@ -34,6 +34,8 @@ or port number. * Use the same load balancer with multiple virtual IPs. * Configure your load balancer to expose UCP or DTR on a port other than 443. +> Additional requirements +> > In addition to configuring your load balancer to distinguish between UCP and DTR, configuring a load balancer for DTR > has [additional requirements](https://docs.docker.com/ee/dtr/admin/configure/use-a-load-balancer/#load-balance-dtr). {: .important} From 4ba7acf5474e1ac279a5d9b52f1146335e7392bc Mon Sep 17 00:00:00 2001 From: Anne Henmi <41210220+ahh-docker@users.noreply.github.com> Date: Fri, 3 Aug 2018 14:31:17 -0600 Subject: [PATCH 4/4] Update use-a-load-balancer.md --- ee/ucp/admin/configure/join-nodes/use-a-load-balancer.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ee/ucp/admin/configure/join-nodes/use-a-load-balancer.md b/ee/ucp/admin/configure/join-nodes/use-a-load-balancer.md index 962bc1c3f98..47657bc8762 100644 --- a/ee/ucp/admin/configure/join-nodes/use-a-load-balancer.md +++ b/ee/ucp/admin/configure/join-nodes/use-a-load-balancer.md @@ -36,8 +36,7 @@ or port number. > Additional requirements > -> In addition to configuring your load balancer to distinguish between UCP and DTR, configuring a load balancer for DTR -> has [additional requirements](https://docs.docker.com/ee/dtr/admin/configure/use-a-load-balancer/#load-balance-dtr). +> In addition to configuring your load balancer to distinguish between UCP and DTR, configuring a load balancer for DTR has [additional requirements](https://docs.docker.com/ee/dtr/admin/configure/use-a-load-balancer/#load-balance-dtr). {: .important} ## Configuration examples