Merge pull request #4 from dtzar/acs-quickstart

Streamline Az commands, add azure storage accounts to helm install

Author: slack

src/quickstart/provider/azure-acs/boot.md

@@ -52,7 +52,6 @@ Next, create an Azure Service Principal that will be used to provision the ACS K
 $ export SP_JSON=`az ad sp create-for-rbac -n="http://acsk8sdeis" --role="Contributor" --scopes="/subscriptions/${SUBSCRIPTION_ID}"`
 $ export SP_NAME=`echo $SP_JSON | jq -r '.name'`
 $ export SP_PASS=`echo $SP_JSON | jq -r '.password'`
-$ export SP_TENANT=`echo $SP_JSON | jq -r '.tenant'`
 $ echo $SP_JSON
 ```
 
@@ -72,39 +71,20 @@ Azure supports two methods to build an ACS Kubernetes cluster, through the Azure
 
 ### Path 1: Azure 'az' CLI
 
-Create an empty Azure resource group to hold the ACS Kubernetes cluster. The location of the resource group can be set to any available Azure datacenter. To see the possible locations use `az account list-locations`. Remember to reference the location by the `name` attribute:
-
-```
-  {
-    "displayName": "West Central US",
-    "id": "/subscriptions/57ac26cf-a9f0-4908-b300-9a4e9a0fb205/locations/westcentralus",
-    "latitude": "40.890",
-    "longitude": "-110.234",
-    "name": "westcentralus",
-    "subscriptionId": null
-  },
-  {
-    "displayName": "West US 2",
-    "id": "/subscriptions/57ac26cf-a9f0-4908-b300-9a4e9a0fb205/locations/westus2",
-    "latitude": "47.233",
-    "longitude": "-119.852",
-    "name": "westus2",
-    "subscriptionId": null
-  }
-]
-```
+Create an empty Azure resource group to hold the ACS Kubernetes cluster. The location of the resource group can be set to any available Azure datacenter. To see the possible locations run `az account list-locations --query [].name --output tsv`
 
 Create an environment variable to hold the resource group name:
 
 ```
 $ export RG_NAME=myresourcegroup
-$ az resource group create --name "${RG_NAME}" --location southcentralus
+$ export DC_LOCATION=mylocation
+$ az group create --name "${RG_NAME}" --location "${DC_LOCATION}"
 ```
 
 Execute the command to deploy the cluster. The `dns-prefix` and `ssh-key-value` must be replaced with your own values.
 
 ```
-$ az acs create --resource-group="${RG_NAME}" --location="southcentralus" \
+$ az acs create --resource-group="${RG_NAME}" --location="${DC_LOCATION}" \
   --service-principal="${SP_NAME}" \
   --client-secret="${SP_PASS}" \
   --orchestrator-type=kubernetes --master-count=1 --agent-count=2 \
@@ -114,7 +94,7 @@ $ az acs create --resource-group="${RG_NAME}" --location="southcentralus" \
   --ssh-key-value @/home/myusername/.ssh/id_rsa.pub
 ```
 
-> Note: When `az acs create` starts the only output will be `waiting for AAD role to propagate..`. This verifies the service principal is propagated and has appropriate permissions.  If this passes the output will change to `... propagate.done`, the provisioning process runs silently in the background, and after a few minutes the `az` command should return with information about the deployment created as shown below.  If `... propagate.done` is not displayed after a few minutes, then there is a problem with the service principal credentials.
+> Note: When `az acs create` starts, the provisioning process runs entirely silent in the background. After a few minutes the `az` command should return with information about the deployment created as shown below.
 
 ```
 {
@@ -187,22 +167,17 @@ The Kubernetes cluster will take a few minutes to complete provisioning and conf
 
 ## Connect to the ACS Kubernetes Cluster
 
-Find the fully qualified domain name (FQDN) for the Kubernetes master:
+Retrieve the fully qualified domain name (FQDN) for the Kubernetes master.
 
 ```
-$ az acs list
-# Part of the way down the output, find and copy the FQDN for the master, it should end with `cloudapp.azure.com`:
-"masterProfile": {
-      "count": 1,
-      "dnsPrefix": "asc-deis-k8s-masters",
-      "fqdn": "mydnsprefix.myregion.cloudapp.azure.com"
-    },
+$ export K8S_FQDN=`az acs list -g $RG_NAME --query [0].masterProfile.fqdn --output tsv`
+$ echo $K8S_FQDN
 ```
 
-Download the Kubeconfig from the master to the local machine, make sure to use the right SSH identity and master FQDN:
+Download the Kubeconfig from the master to the local machine, make sure to use the same SSH credentials used to create the cluster:
 
 ```
-$ scp -i ~/.ssh/id_rsa k8sadmin@mydnsprefix.myregion.cloudapp.azure.com:.kube/config ~/.kube/k8sanddeis.config
+$ scp -i ~/.ssh/id_rsa k8sadmin@$K8S_FQDN:.kube/config ~/.kube/k8sanddeis.config
 The authenticity of host 'mydnsprefix.myregion.cloudapp.azure.com (40.78.71.181)' can't be established.
 ECDSA key fingerprint is a0:09:ff:59:83:47:70:38:d4:0d:68:b2:cf:0f:2a:cf.
 Are you sure you want to continue connecting (yes/no)? yes

src/quickstart/provider/azure-acs/install-azure-acs.md

@@ -27,12 +27,22 @@ Add this repository to Helm:
 $ helm repo add deis https://charts.deis.com/workflow
 ```
 
+## Create New Azure Storage Account
+
+It is recommended to have a storage account for the operational aspects of running DEIS (i.e. holding images, Disaster Recovery, Backup).  This storage account can be passed as parameters during the helm install on the next step.  Replace the SA_NAME variable with a unique name for your storage account and execute these commands.
+```
+$ export SA_NAME=YourGlobalUniqueName
+$ az storage account create -n $SA_NAME -l $DC_LOCATION -g $RG_NAME --sku Premium_LRS
+$ export SA_KEY=`az storage account keys list -n $SA_NAME -g RG_NAME --query keys[0].value --output tsv`
+
+```
+
 ## Install Deis Workflow
 
 Now that Helm is installed and the repository has been added, install Workflow by running:
 
 ```
-$ helm install deis/workflow --namespace deis --set controller.docker_tag=v2.9.0-acs,controller.org=kmala
+$ helm install deis/workflow --namespace=deis --set controller.docker_tag=v2.9.0-acs,controller.org=kmala,global.storage=azure,azure.accountname=$SA_NAME,azure.accountkey=$SA_KEY,azure.registry_container=registry,azure.database_container=database,azure.builder_container=builder
 ```
 
 Helm will install a variety of Kubernetes resources in the `deis` namespace.