From 3268eea0c8816c169561d3ba82cef44c3d963cee Mon Sep 17 00:00:00 2001 From: Martynas Buivys Date: Thu, 15 Aug 2019 02:41:07 +0300 Subject: [PATCH 1/2] Fix a link in release-notes.md (#9203) --- engine/release-notes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/release-notes.md b/engine/release-notes.md index 0b88d40a39..da265c1b46 100644 --- a/engine/release-notes.md +++ b/engine/release-notes.md @@ -169,7 +169,7 @@ in compose-files service configs. [docker/cli#1617](https://github.com/docker/cl * Added pids-limit support in docker update. [moby/moby#32519](https://github.com/moby/moby/pull/32519) * Added support for exact list of capabilities. [moby/moby#38380](https://github.com/moby/moby/pull/38380) * daemon: Now use 'private' ipc mode by default. [moby/moby#35621](https://github.com/moby/moby/pull/35621) -* daemon: switched to semaphore-gated WaitGroup for startup tasks. moby/moby#38301](https://github.com/moby/moby/pull/38301) +* daemon: switched to semaphore-gated WaitGroup for startup tasks. [moby/moby#38301](https://github.com/moby/moby/pull/38301) * Now use `idtools.LookupGroup` instead of parsing `/etc/group` file for docker.sock ownership to fix: `api.go doesn't respect nsswitch.conf`. [moby/moby#38126](https://github.com/moby/moby/pull/38126) * cli: fixed images filter when using multi reference filter. [moby/moby#38171](https://github.com/moby/moby/pull/38171) From 1f805b8de0513d4ba03587ae15ad90ceb80e3671 Mon Sep 17 00:00:00 2001 From: Ivan Sharamok Date: Thu, 15 Aug 2019 08:33:27 -0700 Subject: [PATCH 2/2] Install on azure reqs update 081419 (#9259) * add Az NIC req, clarify azure.json * clarified azure prereq and azure.json req * Reworded the azure.json paragraph --- ee/ucp/admin/install/cloudproviders/install-on-azure.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ee/ucp/admin/install/cloudproviders/install-on-azure.md b/ee/ucp/admin/install/cloudproviders/install-on-azure.md index 0801661a12..8d6ca5de10 100644 --- a/ee/ucp/admin/install/cloudproviders/install-on-azure.md +++ b/ee/ucp/admin/install/cloudproviders/install-on-azure.md @@ -69,10 +69,11 @@ objects are being deployed. ### Azure Configuration File -For Docker UCP to integrate with Microsoft Azure,each UCP node in your cluster -needs an Azure configuration file, `azure.json`. Place the file within -`/etc/kubernetes`. Since the config file is owned by `root`, set its permissions -to `0644` to ensure the container user has read access. +For UCP to integrate with Microsoft Azure, all Linux UCP Manager and Linux UCP +Worker nodes in your cluster need an identical Azure configuration file, +`azure.json`. Place this file within `/etc/kubernetes` on each host. Since the +configution file is owned by `root`, set its permissions to `0644` to ensure +the container user has read access. The following is an example template for `azure.json`. Replace `***` with real values, and leave the other parameters as is.