Updating to Development Kit references (#268)

* Updating to Development Kit reference

* Scrubbing TP references
This commit is contained in:
Heath Lawson 2017-07-31 11:36:49 -07:00 коммит произвёл vikasnav
Родитель a19c80428a
Коммит fa692f4c4e
16 изменённых файлов: 31 добавлений и 37 удалений

Просмотреть файл

@ -9,7 +9,7 @@ This template deploys a simple Linux VM such as ubuntu 14.04, ubuntu 15.10, sles
| Endpoint | Version | Validated |
| ------------- |:-------------:| -----:|
| Microsoft Azure Stack | TP2 | yes|
| Microsoft Azure Stack | - | yes|
## Prerequisites

Просмотреть файл

@ -1,7 +1 @@
# Simple Windows VM with Diagnostic Settings
For Azure Stack POC TP1, enabling Monitoring for Virtual Machines from the UI is disabled. In order to test this functionality, the end user needs to deploy a Virtual Machine directly from an ARM template with Diagnostic Settings enabled. Once the VM is deployed, the Monitoring Agent that is deployed in the VM will be able to send data to the Storage Account provisioned to it.
Note: This is an advanced scenario for this technical preview release.
More Details on how to use this template will be available in the MAS Evaluation Guide.

Просмотреть файл

@ -1,7 +1,7 @@
{
"itemDisplayName": "Simple Windows VM with Diagnostic Settings",
"description": "Deploys a simple Windows VM with Diagnostic Settings. This template also deploys a Virtual Network (with DNS), Public IP address, Network Security Group, and a Network Interface.",
"summary": "For Azure Stack POC TP1, enabling Monitoring for Virtual Machines from the UI is disabled. In order to test this functionality, the end user needs to deploy a Virtual Machine directly from an ARM template with Diagnostic Settings enabled. Once the VM is deployed, the Monitoring Agent that is deployed in the VM will be able to send data to the Storage Account provisioned to it.",
"summary": "",
"githubUsername": "azurestack",
"dateUpdated": "2016-09-20"
}

Просмотреть файл

@ -15,7 +15,7 @@ This template shows a simple example to deploy OSPatching Extension on an Linux
| Endpoint | Version | Validated |
| ------------- |:-------------:| -----:|
| Microsoft Azure Stack | TP2 | yes|
| Microsoft Azure Stack | - | yes|
| Microsoft Azure | | yes|
## Prerequisites for Azure Stack

Просмотреть файл

@ -14,7 +14,7 @@ This template deploys a [solution name]. The [solution name] is a [description]
| Endpoint | Version | Validated |
| ------------- |:-------------:| -----:|
| Microsoft Azure | - | no |
| Microsoft Azure Stack | TP1 | no |
| Microsoft Azure Stack | | no |
## Prerequisites
@ -33,7 +33,7 @@ You can either click the "deploy to Azure" button at the beginning of this docum
$AadTenantId = "contoso"
# Option 2) If you don't know the prefix of your AzureAD namespace, run the following cmdlets.
# Validate with the Azure AD credentials you also use to sign in as a tenant to Microsoft Azure Stack Technical Preview.
# Validate with the Azure AD credentials you also use to sign in as a tenant to Microsoft Azure Stack Development Kit.
$AadTenant = Login-AzureRmAccount
$AadTenantId = $AadTenant.Context.Tenant.TenantId

Просмотреть файл

@ -25,7 +25,7 @@ https://azure.microsoft.com/en-us/documentation/articles/log-analytics-get-start
$AadTenantId = "contoso"
# Option 2) If you don't know the prefix of your AzureAD namespace, run the following cmdlets.
# Validate with the Azure AD credentials you also use to sign in as a tenant to Microsoft Azure Stack Technical Preview.
# Validate with the Azure AD credentials you also use to sign in as a tenant to Microsoft Azure Stack Development Kit.
$AadTenant = Login-AzureRmAccount
$AadTenantId = $AadTenant.Context.Tenant.TenantId

Просмотреть файл

@ -1,14 +1,14 @@
# Microsoft Azure Stack Quickstart Templates
This repository contains Azure Resource Manager deployment templates that have been tested on Microsoft Azure Stack TP3 Refresh.
This repository contains Azure Resource Manager deployment templates that have been tested with Microsoft Azure Stack Development Kit.
## What repository?
The primary Azure Resource Manager templates repository on GitHub is the azure-quickstart-templates. You can find the repository here https://github.com/Azure/azure-quickstart-templates
Over time many GitHub users have contributed to the repository, resulting in a huge collection of more than 400 deployment templates. This repository is a great starting point to get a better understanding of how you can deploy various kinds of environment to Microsoft Azure. If you scroll through the templates in the azure-quickstart-templates repository, you will notice that there are templates that reference services (resource providers) that are not part of Microsoft Azure Stack TP3 Refresh, such as ExpressRoute or CDN.
Over time many GitHub users have contributed to the repository, resulting in a huge collection of more than 400 deployment templates. This repository is a great starting point to get a better understanding of how you can deploy various kinds of environment to Microsoft Azure. If you scroll through the templates in the azure-quickstart-templates repository, you will notice that there are templates that reference services (resource providers) that are not part of Microsoft Azure Stack Development Kit, such as ExpressRoute or CDN.
To ensure the successful deployment of templates to both Microsoft Azure and Microsoft Azure Stack TP3 Refresh, this temporary GitHub repository AzureStack-quickstart-templates was created. This repository contains samples to test your Microsoft Azure Stack TP3 Refresh environment. Over time, some templates from this temporary repository will be moved to the azure-quickstart-templates repository and this temporary AzureStack-quickstart-templates repository will be depreacated.
To ensure the successful deployment of templates to both Microsoft Azure and Microsoft Azure Stack Development Kit, this temporary GitHub repository AzureStack-quickstart-templates was created. This repository contains samples to test your Microsoft Azure Stack Development Kit environment. Over time, some templates from this temporary repository will be moved to the azure-quickstart-templates repository and this temporary AzureStack-quickstart-templates repository will be depreacated.
**If you want to contribute your Azure Resource Manager templates to GitHub, you should make your contribution to the azure-quickstart-templates repository.**
@ -23,20 +23,20 @@ Familiarizing yourself with these documentes, improves the contribution experien
The contribution guide also explains how to ensure that your deployment template complies with the requirements for it to show up on the gallery in the public Microsoft Azure website.
## Azure Resource Manager limitations in Microsoft Azure Stack TP3 Refresh
## Azure Resource Manager limitations in Microsoft Azure Stack Development Kit
You can use all kind of template functions within your deployment template. You can find a description of these template functions here: https://azure.microsoft.com/en-us/documentation/articles/resource-group-template-functions/
To ensure that the templates that you create will deploy to both Microsoft Azure and Microsoft Azure Stack TP3 Refresh, you must be aware of a couple of limitations related to Azure Resource Manager in the Microsoft Azure Stack TP3 Refresh. Some functions of Azure Resource Manager are not yet available in this Technical Preview release of Microsoft Azure Stack.
To ensure that the templates that you create will deploy to both Microsoft Azure and Microsoft Azure Stack Development Kit, you must be aware of a couple of limitations related to Azure Resource Manager in the Microsoft Azure Stack Development Kit. Some functions of Azure Resource Manager are not yet available in this release of Microsoft Azure Stack.
The following template functions are not available in Microsoft Azure Stack Technical Preview yet.
The following template functions are not available in Microsoft Azure Stack Development Kit yet.
* skip
* take
### API Versions for Resource Providers
Each resource provider in Microsoft Azure has its own API version. Microsoft Azure Stack TP3 Refresh supports the current API versions for the available resource providers, with some minor exceptions. To ensure your template will succesfully deploy to both Microsoft Azure and Microsoft Azure Stack TP3 Refresh, use the latest API versions that are available in Microsoft Azure Stack TP3 Refresh for all resources in your template. To retrieve a list of the available API versions connect to your Microsoft Azure Stack TP3 Refresh environment by following the **Authenticate PowerShell with Microsoft Azure Stack** procedure described in this article.
Each resource provider in Microsoft Azure has its own API version. Microsoft Azure Development Kith supports the current API versions for the available resource providers, with some minor exceptions. To ensure your template will succesfully deploy to both Microsoft Azure and Microsoft Azure Stack Development Kit, use the latest API versions that are available in Microsoft Azure Stack Development Kit for all resources in your template. To retrieve a list of the available API versions connect to your Microsoft Azure Stack Development Kit environment by following the **Authenticate PowerShell with Microsoft Azure Stack** procedure described in this article.
https://azure.microsoft.com/en-us/documentation/articles/azure-stack-deploy-template-powershell/
@ -56,8 +56,8 @@ You can verify if an existing deployment template is valid for a given environme
Test-AzureRmResourceGroupDeployment -ResourceGroupName ExampleGroup -TemplateFile c:\Templates\azuredeploy.json
```
Please note that this cmdlet does not verify the resource provider specific properties for the resources within the template. This cmdlet can be used for Microsoft Azure and Microsoft Azure Stack TP3 Refresh.
Please note that this cmdlet does not verify the resource provider specific properties for the resources within the template. This cmdlet can be used for Microsoft Azure and Microsoft Azure Stack Development Kit.
## Next steps
Start with creating deployment templates in your own repository. Make sure they deploy to both Microsoft Azure and Microsoft Azure Stack TP3 Refresh, they are in line with the guidelines in the azure-quickstart-templates contribution guide and the guidelines described here. Fork the azure-quickstart-templates repository, add or update and send pull requests to the azure-quickstart-templates. If your templates comply with the requirments they will even show up in the gallery on the public Microsoft Azure website.
Start with creating deployment templates in your own repository. Make sure they deploy to both Microsoft Azure and Microsoft Azure Stack Development Kit, they are in line with the guidelines in the azure-quickstart-templates contribution guide and the guidelines described here. Fork the azure-quickstart-templates repository, add or update and send pull requests to the azure-quickstart-templates. If your templates comply with the requirments they will even show up in the gallery on the public Microsoft Azure website.

Просмотреть файл

@ -14,7 +14,7 @@ This template deploys a **solution name**. The **solution name** is a **descript
| Endpoint | Version | Validated |
| ------------- |:-------------:| -----:|
| Microsoft Azure | - | no |
| Microsoft Azure Stack | TP1 | no |
| Microsoft Azure Stack | - | no |
## Solution overview and deployed resources

Просмотреть файл

@ -34,7 +34,7 @@ https://github.com/Azure/AzureStack-QuickStart-Templates/tree/master/ad-non-ha
$AadTenantId = "contoso"
# Option 2) If you don't know the prefix of your AzureAD namespace, run the following cmdlets.
# Validate with the Azure AD credentials you also use to sign in as a tenant to Microsoft Azure Stack Technical Preview.
# Validate with the Azure AD credentials you also use to sign in as a tenant to Microsoft Azure Stack Development Kit.
$AadTenant = Login-AzureRmAccount
$AadTenantId = $AadTenant.Context.Tenant.TenantId

Просмотреть файл

@ -34,7 +34,7 @@ configsecuritypolicy cleanuppolicy.xml
$AadTenantId = "contoso"
# Option 2) If you don't know the prefix of your AzureAD namespace, run the following cmdlets.
# Validate with the Azure AD credentials you also use to sign in as a tenant to Microsoft Azure Stack Technical Preview.
# Validate with the Azure AD credentials you also use to sign in as a tenant to Microsoft Azure Stack Development Kit.
$AadTenant = Login-AzureRmAccount
$AadTenantId = $AadTenant.Context.Tenant.TenantId

Просмотреть файл

@ -14,7 +14,7 @@ This template deploys Exchange 2016.
| Endpoint | Version | Validated |
| ------------- |:-------------:| -----:|
| Microsoft Azure | - | YES |
| Microsoft Azure Stack | TP2 | YES |
| Microsoft Azure Stack | - | YES |
## Deployed resources

Просмотреть файл

@ -19,7 +19,7 @@ NOTE: There is a 90 minutes Azure time-out which you can hit if large number of
| Endpoint | Version | Validated |
| ------------- |:-------------:| -----:|
| Microsoft Azure | - | yes |
| Microsoft Azure Stack | TP2 | yes |
| Microsoft Azure Stack | - | yes |
## Deployed resources

Просмотреть файл

@ -5,7 +5,7 @@ This template will create a Remote Desktop Sesson Collection farm using the Powe
+ One external load balancer
+ One VM configured as RDS Connection Broker and Licensing Server role
+ One VM configured as RDS Gateway and Web access Server role
+ One (or more) VMs configured as RDSH host role. NOTE: Because HA is not supported on AzureStack TP2, please use only one VM or it will fail.
+ One (or more) VMs configured as RDSH host role. NOTE: Because HA is not supported on Azure Stack Development Kit, please use only one VM or it will fail.
+ The imageSKU is choice in parameter and rest of image configuration is defined in variables - but the scripts that configure this deployment have only been tested with windows server 2012 R2 data center image and may not work on other images.
## Deploying from Portal
@ -37,11 +37,11 @@ Change working folder to the folder containing this template
$AadTenantId = <Tenant Id> #GUID Specific to the AAD Tenant
Add-AzureRmEnvironment -Name 'Azure Stack' `
    -ActiveDirectoryEndpoint ("https://login.windows.net/$AadTenantId/") `
    -ActiveDirectoryServiceEndpointResourceId "https://azurestack.local-api/" `
    -ResourceManagerEndpoint ("https://api.azurestack.local/") `
    -GalleryEndpoint ("https://gallery.azurestack.local/") `
    -GraphEndpoint "https://graph.windows.net/"
<EFBFBD><EFBFBD><EFBFBD> -ActiveDirectoryEndpoint ("https://login.windows.net/$AadTenantId/") `
<EFBFBD><EFBFBD><EFBFBD> -ActiveDirectoryServiceEndpointResourceId "https://azurestack.local-api/" `
<EFBFBD><EFBFBD><EFBFBD> -ResourceManagerEndpoint ("https://api.azurestack.local/") `
<EFBFBD><EFBFBD><EFBFBD> -GalleryEndpoint ("https://gallery.azurestack.local/") `
<EFBFBD><EFBFBD><EFBFBD> -GraphEndpoint "https://graph.windows.net/"
# Get Azure Stack Environment Information
$env = Get-AzureRmEnvironment 'Azure Stack'
@ -61,4 +61,4 @@ New-AzurermResourceGroup -Name $resourceGroupName -Location $location
#Start new Deployment
New-AzurermResourceGroupDeployment -Name $deploymentName -ResourceGroupName $resourceGroupName `
    -TemplateParameterFile .\azuredeploy.parameters.json -TemplateFile .\azuredeploy.json
<EFBFBD><EFBFBD><EFBFBD> -TemplateParameterFile .\azuredeploy.parameters.json -TemplateFile .\azuredeploy.json

Просмотреть файл

@ -10,7 +10,7 @@ This template deploys a load test for SharePoint 2013 personal sites. This templ
| Endpoint | Version | Validated |
| ------------- |:-------------:| -----:|
| Microsoft Azure | - | no |
| Microsoft Azure Stack | TP1 | no |
| Microsoft Azure Stack | - | no |
## Deployed resources
@ -47,7 +47,7 @@ You can either click the "deploy to Azure" button at the beginning of this docum
$AadTenantId = "contoso"
# Option 2) If you don't know the prefix of your AzureAD namespace, run the following cmdlets.
# Validate with the Azure AD credentials you also use to sign in as a tenant to Microsoft Azure Stack Technical Preview.
# Validate with the Azure AD credentials you also use to sign in as a tenant to Microsoft Azure Stack Development Kit.
$AadTenant = Login-AzureRmAccount
$AadTenantId = $AadTenant.Context.Tenant.TenantId

Просмотреть файл

@ -23,7 +23,7 @@ This template requires an existing Windows VM
$AadTenantId = "contoso"
# Option 2) If you don't know the prefix of your AzureAD namespace, run the following cmdlets.
# Validate with the Azure AD credentials you also use to sign in as a tenant to Microsoft Azure Stack Technical Preview.
# Validate with the Azure AD credentials you also use to sign in as a tenant to Microsoft Azure Stack Development Kit.
$AadTenant = Login-AzureRmAccount
$AadTenantId = $AadTenant.Context.Tenant.TenantId

Просмотреть файл

@ -47,7 +47,7 @@ The components are connected to an existing virtual network to allow connectivit
$AadTenantId = "contoso"
# Option 2) If you don't know the prefix of your AzureAD namespace, run the following cmdlets.
# Validate with the Azure AD credentials you also use to sign in as a tenant to Microsoft Azure Stack Technical Preview.
# Validate with the Azure AD credentials you also use to sign in as a tenant to Microsoft Azure Stack Development Kit.
$AadTenant = Login-AzureRmAccount
$AadTenantId = $AadTenant.Context.Tenant.TenantId