From adaf0bc885af9b4482588f738cb87081a16daa0f Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Tue, 26 Feb 2019 07:10:42 -0500 Subject: [PATCH 1/2] Update join-windows-nodes-to-cluster.md --- .../join-windows-nodes-to-cluster.md | 27 +++---------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/ee/ucp/admin/configure/join-nodes/join-windows-nodes-to-cluster.md b/ee/ucp/admin/configure/join-nodes/join-windows-nodes-to-cluster.md index e0b8e911fc..3333888a9c 100644 --- a/ee/ucp/admin/configure/join-nodes/join-windows-nodes-to-cluster.md +++ b/ee/ucp/admin/configure/join-nodes/join-windows-nodes-to-cluster.md @@ -26,30 +26,11 @@ Docker Enterprise 2.1. Follow these steps to configure the docker daemon and the Windows environment. -1. Add a label to the node. -2. Pull the Windows-specific image of `ucp-agent`, which is named `ucp-agent-win`. -3. Run the Windows worker setup script provided with `ucp-agent-win`. -4. Join the cluster with the token provided by the Docker UCP web interface or CLI. +1. Pull the Windows-specific image of `ucp-agent`, which is named `ucp-agent-win`. +2. Run the Windows worker setup script provided with `ucp-agent-win`. +3. Join the cluster with the token provided by the Docker UCP web interface or CLI. -### Add a label to the node - -Configure the Docker Engine running on the node to have a label. This makes -it easier to deploy applications on nodes with this label. - -Create the file `C:\ProgramData\docker\config\daemon.json` with the following -content: - -``` -{ - "labels": ["os=windows"] -} -``` - -Restart Docker for the changes to take effect: - -``` -Restart-Service docker -``` +**Note**: Windows nodes are automatically assigned the `ostype` label `ostype=windows`. ### Pull the Windows-specific images From ab81071360849c22258ca142afc04811af2717ed Mon Sep 17 00:00:00 2001 From: Maria Bermudez Date: Mon, 11 Mar 2019 17:56:25 -0700 Subject: [PATCH 2/2] Make note explicit for EE 2.1 --- .../configure/join-nodes/join-windows-nodes-to-cluster.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ee/ucp/admin/configure/join-nodes/join-windows-nodes-to-cluster.md b/ee/ucp/admin/configure/join-nodes/join-windows-nodes-to-cluster.md index 3333888a9c..5a6a1a9545 100644 --- a/ee/ucp/admin/configure/join-nodes/join-windows-nodes-to-cluster.md +++ b/ee/ucp/admin/configure/join-nodes/join-windows-nodes-to-cluster.md @@ -30,7 +30,9 @@ Follow these steps to configure the docker daemon and the Windows environment. 2. Run the Windows worker setup script provided with `ucp-agent-win`. 3. Join the cluster with the token provided by the Docker UCP web interface or CLI. -**Note**: Windows nodes are automatically assigned the `ostype` label `ostype=windows`. +### Add a label to the node + +As of Docker Enterprise 2.1, which includes UCP 3.1, this step is no longer necessary. Windows nodes are automatically assigned the `ostype` label `ostype=windows`. ### Pull the Windows-specific images