From 9c8dc628105ebb7af1f0977cab210c9544697455 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Thu, 24 Jan 2019 17:05:48 -0500 Subject: [PATCH 1/2] Update service-clusters.md --- ee/ucp/interlock/usage/service-clusters.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/ee/ucp/interlock/usage/service-clusters.md b/ee/ucp/interlock/usage/service-clusters.md index 837a6c0663..ddceb26a5c 100644 --- a/ee/ucp/interlock/usage/service-clusters.md +++ b/ee/ucp/interlock/usage/service-clusters.md @@ -45,7 +45,7 @@ map[nodetype:loadbalancer region:us-west] Next, we will create a configuration object for Interlock that contains multiple extensions with varying service clusters: ```bash -$> cat << EOF | docker config create com.docker.ucp.interlock.conf-1 - +$> cat << EOF | docker config create com.docker.ucp.interlock.service-clusters.conf-1 - ListenAddr = ":8080" DockerURL = "unix:///var/run/docker.sock" PollInterval = "3s" @@ -115,7 +115,11 @@ Next we will create a dedicated network for Interlock and the extensions: $> docker network create -d overlay ucp-interlock ``` -Now we can create the Interlock service: +Now we can create the Interlock service. + +Important: The `--name` value specified in the following code sample applies to UCP versions 3.0.10 and later, and versions 3.1.4 and later. + +If you are working with UCP version 3.0.0 - 3.0.9 or 3.1.0 - 3.1.3, specify `--name ucp-interlock-service-clusters`. ```bash $> docker service create \ @@ -123,7 +127,7 @@ $> docker service create \ --mount src=/var/run/docker.sock,dst=/var/run/docker.sock,type=bind \ --network ucp-interlock \ --constraint node.role==manager \ - --config src=com.docker.ucp.interlock.conf-1,target=/config.toml \ + --config src=com.docker.ucp.interlock.service-clusters.conf-1,target=/config.toml \ {{ page.ucp_org }}/ucp-interlock:{{ page.ucp_version }} run -c /config.toml sjpgq7h621exno6svdnsvpv9z ``` From a92d1b85c0c6f6277e0cd7492c300d69e1acdea2 Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Thu, 24 Jan 2019 17:45:18 -0500 Subject: [PATCH 2/2] Update service-clusters.md --- ee/ucp/interlock/usage/service-clusters.md | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/ee/ucp/interlock/usage/service-clusters.md b/ee/ucp/interlock/usage/service-clusters.md index ddceb26a5c..6f8010e557 100644 --- a/ee/ucp/interlock/usage/service-clusters.md +++ b/ee/ucp/interlock/usage/service-clusters.md @@ -42,10 +42,14 @@ map[nodetype:loadbalancer region:us-west] {% endraw %} ``` -Next, we will create a configuration object for Interlock that contains multiple extensions with varying service clusters: +Next, we will create a configuration object for Interlock that contains multiple extensions with varying service clusters. + +Important: The configuration object specified in the following code sample applies to UCP versions 3.0.10 and later, and versions 3.1.4 and later. + +If you are working with UCP version 3.0.0 - 3.0.9 or 3.1.0 - 3.1.3, specify `com.docker.ucp.interlock.service-clusters.conf`. ```bash -$> cat << EOF | docker config create com.docker.ucp.interlock.service-clusters.conf-1 - +$> cat << EOF | docker config create com.docker.ucp.interlock.conf-1 - ListenAddr = ":8080" DockerURL = "unix:///var/run/docker.sock" PollInterval = "3s" @@ -117,9 +121,9 @@ $> docker network create -d overlay ucp-interlock Now we can create the Interlock service. -Important: The `--name` value specified in the following code sample applies to UCP versions 3.0.10 and later, and versions 3.1.4 and later. +Important: The `--name` value and configuration object specified in the following code sample applies to UCP versions 3.0.10 and later, and versions 3.1.4 and later. -If you are working with UCP version 3.0.0 - 3.0.9 or 3.1.0 - 3.1.3, specify `--name ucp-interlock-service-clusters`. +If you are working with UCP version 3.0.0 - 3.0.9 or 3.1.0 - 3.1.3, specify `--name ucp-interlock-service-clusters` and `src=com.docker.ucp.interlock.service-clusters.conf-1` . ```bash $> docker service create \ @@ -127,7 +131,7 @@ $> docker service create \ --mount src=/var/run/docker.sock,dst=/var/run/docker.sock,type=bind \ --network ucp-interlock \ --constraint node.role==manager \ - --config src=com.docker.ucp.interlock.service-clusters.conf-1,target=/config.toml \ + --config src=com.docker.ucp.interlock.conf-1,target=/config.toml \ {{ page.ucp_org }}/ucp-interlock:{{ page.ucp_version }} run -c /config.toml sjpgq7h621exno6svdnsvpv9z ```