From 91fb055d0c654b436f6ddcaaa9686b074aa5131a Mon Sep 17 00:00:00 2001 From: Joao Fernandes Date: Mon, 9 May 2016 14:13:03 -0700 Subject: [PATCH] Updates uninstall docs This is PR #1416, with a couple more changes. Closes #1416. --- configuration/multi-host-networking.md | 20 ++++++++++++++--- installation/uninstall.md | 30 ++++++++++++-------------- 2 files changed, 31 insertions(+), 19 deletions(-) diff --git a/configuration/multi-host-networking.md b/configuration/multi-host-networking.md index b50dab9dc2..729081f3ff 100644 --- a/configuration/multi-host-networking.md +++ b/configuration/multi-host-networking.md @@ -51,7 +51,21 @@ command line on any UCP node and do the following: $ docker network create -d overlay my-custom-network ``` -## Get each node host IP address +## Automatic Configuration + +As of UCP 1.1 and Docker Engine 1.11, discovery is automatically configured +when a node is installed or joined to the UCP cluster. Depending on your +engine's configuration, this may require a restart to take effect. The output +of the install and join operations will inform you if automatic configuration +succeeded or if configuration was attempted but a restart will be required. + +If you are running Docker Engine 1.10, proceed to the manual configuration. + +## Manual Configuration + +Some setups will require manually setting up engine configuration. + +### Get each node host IP address To continue with this procedure, you need to know the host address values you used on each controller or node. This is the address used with the `install` or @@ -71,7 +85,7 @@ nodes for network communication. Make sure you do not include the port number, just the IP address. -## Enable the networking feature +### Enable the networking feature If you followed the prerequisites, you should have a list of the host-address values you used with `install` to create the controller, the replicas, and @@ -193,7 +207,7 @@ To enable the networking feature, do the following. 9. After enabling networking on the controllers and replicas, repeat steps 2-6 on the remaining nodes in the cluster. -## Adding new nodes and replicas +### Adding new nodes and replicas Once your UCP installation is up and running, you may need to add a new worker node or a new replica node. If you add a new worker node, you must run diff --git a/installation/uninstall.md b/installation/uninstall.md index 65ae2d7243..772e1dfb3f 100644 --- a/installation/uninstall.md +++ b/installation/uninstall.md @@ -20,14 +20,11 @@ affect any other containers. To see what options are available in the uninstall command, check the [uninstall command reference](../reference/uninstall.md). -To uninstall Docker UCP from a cluster, you should: +To uninstall Docker UCP from a cluster, you need to: 1. Uninstall UCP from every node joined in the cluster, -2. Uninstall UCP from every controller node, one at a time. - -When you install UCP, your Docker Engine is automatically configured for -multi-host networking. When uninstalling, you need to delete or update the -`/etc/docker/daemon.json` file and restart the Docker daemon on each node. +2. Uninstall UCP from every controller node, one at a time, +3. Restart the Docker engine on all the nodes. ## Example @@ -64,7 +61,7 @@ You can also use flags to pass values to the uninstall command. The uninstall command removes all UCP-related images except the `docker/ucp` image. -3. Remove the `docker/ucp` image. +3. Remove the docker/ucp image. ``` $ docker rmi docker/ucp @@ -75,19 +72,20 @@ You can also use flags to pass values to the uninstall command. Deleted: sha256:93743d5df2362466e2fe116a677ec6a4b0091bd09e889abfc9109047fcfcdebf ``` -4. Delete the engine-discovery configuration +5. Restart the Docker daemon. - ```bash - $ sudo rm /etc/docker/daemon.json - ``` + When you install or join a node, UCP configures the Docker engine on that + node for multi-host networking. When uninstalling, the configuration is + reverted to its original state, but you need to restart the Docker engine + for the configurations to take effect. -5. Restart the Docker daemon - - As an example, on a Ubuntu host + As an example, to restart the Docker engine on a Ubuntu distribution: ```bash $ sudo service docker restart ``` -6. Go to the UCP web application, and confirm the node was removed from the -cluster. +6. Confirm the node was removed from the cluster. + + In the UCP web application, confirm the node is no longer listed. It + might take a few minutes for UCP to stop listing that node.