From 6c5174393ea750fa966712df759524501958c408 Mon Sep 17 00:00:00 2001 From: Trapier Marshall Date: Wed, 17 Apr 2019 16:52:48 -0400 Subject: [PATCH] Correct default-address-pool to default-addr-pool WHAT I DID: ``` git grep -l default-address-pool |\ xargs sed -i 's:default-address-pool:default-addr-pool:g' ``` ... then put the `engine/release-notes.md` back to `--default-address-pool`, since it refers to `dockerd`. REFERENCES: client version 18.09.3: ``` $ docker swarm init --help |grep default-addr --default-addr-pool ipNetSlice default address pool in CIDR format (default []) --default-addr-pool-mask-length uint32 default address pool subnet mask length (default 24) ``` server version 18.09.3: ``` $ dockerd --help |grep default-addr --default-address-pool pool-options Default address pools for node specific local networks ``` --- engine/swarm/networking.md | 2 +- engine/swarm/swarm-mode.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/engine/swarm/networking.md b/engine/swarm/networking.md index 2b1e07109d..91fcb77f6b 100644 --- a/engine/swarm/networking.md +++ b/engine/swarm/networking.md @@ -199,7 +199,7 @@ To customize subnet allocation for your Swarm networks, you can [optionally conf For example, the following command is used when initializing Swarm: ```bash -$ docker swarm init --default-address-pool 10.20.0.0/16 --default-addr-pool-mask-length 26` +$ docker swarm init --default-addr-pool 10.20.0.0/16 --default-addr-pool-mask-length 26` ``` Whenever a user creates a network, but does not use the `--subnet` command line option, the subnet for this network will be allocated sequentially from the next available subnet from the pool. If the specified network is already allocated, that network will not be used for Swarm. diff --git a/engine/swarm/swarm-mode.md b/engine/swarm/swarm-mode.md index 2670f5e21b..190efa38ee 100644 --- a/engine/swarm/swarm-mode.md +++ b/engine/swarm/swarm-mode.md @@ -79,11 +79,11 @@ To create the custom address pool for Swarm, you must define at least one defaul Docker allocates subnet addresses from the address ranges specified by the `--default-addr-pool` option. For example, a command line option `--default-addr-pool 10.10.0.0/16` indicates that Docker will allocate subnets from that `/16` address range. If `--default-addr-pool-mask-len` were unspecified or set explicitly to 24, this would result in 256 `/24` networks of the form `10.10.X.0/24`. -The subnet range comes from the `--default-addr-pool`, (such as `10.10.0.0/16`). The size of 16 there represents the number of networks one can create within that `default-addr-pool` range. The `--default-address-pool` option may occur multiple times with each option providing additional addresses for docker to use for overlay subnets. +The subnet range comes from the `--default-addr-pool`, (such as `10.10.0.0/16`). The size of 16 there represents the number of networks one can create within that `default-addr-pool` range. The `--default-addr-pool` option may occur multiple times with each option providing additional addresses for docker to use for overlay subnets. The format of the command is: ``` -$ docker swarm init --default-address-pool [--default-address-pool --default-addr-pool-mask-length ] +$ docker swarm init --default-addr-pool [--default-addr-pool --default-addr-pool-mask-length ] ``` To create a default IP address pool with a /16 (class B) for the 10.20.0.0 network looks like this: @@ -105,7 +105,7 @@ all the subnets are exhausted. Refer to the following pages for more information: - [Swarm networking](./networking.md) for more information about the default address pool usage - [UCP Installation Planning](../../ee/ucp/admin/install/plan-installation.md) for more information about planning the network design before installation -- `docker swarm init` [CLI reference](../reference/commandline/swarm_init.md) for more detail on the `--default-address-pool` flag. +- `docker swarm init` [CLI reference](../reference/commandline/swarm_init.md) for more detail on the `--default-addr-pool` flag. ### Configure the advertise address