docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing a few nits :) 

Signed-off-by: ollypom <oppomeroy@gmail.com>
This commit is contained in:
ollypom 2018-11-21 11:14:42 +00:00
parent b130e505f6
commit 92b803745e
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
datacenter/ucp/3.0/guides/admin/install/install-on-azure.md
View File

@ -158,7 +158,9 @@ Follow the steps below to configure multiple IP addresses per VM NIC.
docker swarm init docker swarm init
``` ```
2. Note the tokens for managers and workers. 2. Note the tokens for managers and workers. You may retrieve the join tokens
at any time by running `$ docker swarm join-token manager` or `$ docker swarm
join-token worker` on the manager node.
3. Join two other nodes on the cluster as manager (recommended for HA) by running: 3. Join two other nodes on the cluster as manager (recommended for HA) by running:
```bash ```bash
@ -175,10 +177,12 @@ Follow the steps below to configure multiple IP addresses per VM NIC.
creating the Service Principal. creating the Service Principal.
``` ```
$ cat > azure_ucp_admin.toml <<EOF
AZURE_CLIENT_ID = "<AD App ID field from Step 1>" AZURE_CLIENT_ID = "<AD App ID field from Step 1>"
AZURE_TENANT_ID = "<AD Tenant ID field from Step 1>" AZURE_TENANT_ID = "<AD Tenant ID field from Step 1>"
AZURE_SUBSCRIPTION_ID = "<Azure subscription ID>" AZURE_SUBSCRIPTION_ID = "<Azure subscription ID>"
AZURE_CLIENT_SECRET = "<AD App Secret field from Step 1>" AZURE_CLIENT_SECRET = "<AD App Secret field from Step 1>"
EOF
``` ```
6. Create a Docker Swarm secret based on the "azure_ucp_admin.toml" file. 6. Create a Docker Swarm secret based on the "azure_ucp_admin.toml" file.

4
ee/ucp/admin/install/install-on-azure.md
View File

@ -24,7 +24,9 @@ You have two options for provisoning IPs for the Kubernetes cluster on Azure:
and by default will provision 128 IP address for each node. This value can be and by default will provision 128 IP address for each node. This value can be
configured via the `azure_ip_count`in the UCP configured via the `azure_ip_count`in the UCP
[configuration file](../configure/ucp-configuration-file) before or after the [configuration file](../configure/ucp-configuration-file) before or after the
UCP installation. UCP installation. Note if this value is reduced post installation, existing
VMs will not be reconciled, a user would have to manually edit the IP count
in Azure.
- Manually provision additional IP address for each Azure VM. This could be done - Manually provision additional IP address for each Azure VM. This could be done
as part of an Azure Virtual Machine Scale Set via an ARM template, an example as part of an Azure Virtual Machine Scale Set via an ARM template, an example
can be found [here](#set-up-ip-configurations-on-an-azure-virtual-machine-scale-set). can be found [here](#set-up-ip-configurations-on-an-azure-virtual-machine-scale-set).