Skip to content

Commit 5f66a2f

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-landing-data-lake-store
2 parents f7130d0 + 99b24ee commit 5f66a2f

File tree

2 files changed

+17
-7
lines changed

2 files changed

+17
-7
lines changed

articles/aks/TOC.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,18 +117,12 @@
117117
items:
118118
- name: Cluster operations
119119
items:
120-
- name: Create an AKS cluster
121-
href: /cli/azure/aks#az-aks-create
122-
maintainContext: true
123120
- name: Scale an AKS cluster
124121
href: scale-cluster.md
125122
- name: Upgrade an AKS cluster
126123
href: upgrade-cluster.md
127124
- name: Process node OS updates
128125
href: node-updates-kured.md
129-
- name: Delete an AKS cluster
130-
href: /cli/azure/aks#az-aks-delete
131-
maintainContext: true
132126
- name: Integrate ACR with an AKS cluster
133127
href: cluster-container-registry-integration.md
134128
- name: Create virtual nodes

articles/cosmos-db/how-to-setup-cmk.md

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Learn how to configure customer-managed keys for your Azure Cosmos
44
author: ThomasWeiss
55
ms.service: cosmos-db
66
ms.topic: conceptual
7-
ms.date: 01/14/2020
7+
ms.date: 03/12/2020
88
ms.author: thweiss
99
ROBOTS: noindex, nofollow
1010
---
@@ -184,6 +184,22 @@ New-AzResourceGroupDeployment `
184184
-keyVaultKeyUri $keyVaultKeyUri
185185
```
186186

187+
### Using the Azure CLI
188+
189+
When you create a new Azure Cosmos account through the Azure CLI, pass the URI of the Azure Key Vault key that you copied earlier under the **--key-uri** parameter.
190+
191+
```azurecli-interactive
192+
resourceGroupName='myResourceGroup'
193+
accountName='mycosmosaccount'
194+
keyVaultKeyUri = 'https://<my-vault>.vault.azure.net/keys/<my-key>'
195+
196+
az cosmosdb create \
197+
-n $accountName \
198+
-g $resourceGroupName \
199+
--locations regionName='West US 2' failoverPriority=0 isZoneRedundant=False \
200+
--key-uri $keyVaultKeyUri
201+
```
202+
187203
## Frequently asked questions
188204

189205
### Is there any additional charge for using customer-managed keys?

0 commit comments

Comments
 (0)