Azure
/
AzureStack-QuickStart-Templates
зеркало из https://github.com/Azure/AzureStack-QuickStart-Templates.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

AD, SQL, and SharePoint non-HA fixes for Azure compatibility 

Made several fixes to make the AD, SQL and SharePoint non HA template
deployable on Azure and Azure Stack. Summary of fixes:
---All templates---
* Fixed the default DNS prefix values for public IP addresses
* Removed the hard coded DNS IP address from the Azure Stack TP1
workaround for internet connectivity
* Dynamically detect the data disk numbers to account for Azure's
default data disk (on DSC configuration scripts)
---AD---
* Automatically detect DNS server addresses for internet connectivity
and add them as DNS forwarders after AD setup (on DSC configuration
script)
---SQL---
* Merged the changes to add the parameter for SQL download source
* Added install of .NET 3.5 on the SQL server machine (on DSC
configuration script)
---SharePoint---
* Added the SQL download source parameter
* Fixed a bug in which the public IP for SharePoint was not getting
correctly assigned
* Detect if .NET 4.6 is installed if so uninstall it (workaround for a
SharePoint 2013 setup bug, done on the DSC configuration script)
This commit is contained in:
JesusAlvarezTorres 2016-07-19 14:02:24 -07:00
Родитель b1187e29fc
Коммит f98713e4bb
11 изменённых файлов: 72 добавлений и 39 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

Двоичные данные
ad-non-ha/CreateADPDC.ps1.zip
Просмотреть файл

Двоичный файл не отображается.

16
ad-non-ha/azuredeploy.json
Просмотреть файл

@ -41,16 +41,15 @@
"networkSecurityGroups": "2015-05-01-preview"
}
},
"assetLocation": "https://raw.githubusercontent.com/Azure/AzureStack-QuickStart-Templates/master/ad-non-ha",
"assetLocation": "https://raw.githubusercontent.com/Azure/AzureStack-QuickStart-Templates/AzureStackTechnicalPreview2/ad-non-ha",
"adVMSize": "Standard_A1",
"vmNetworkSubnet": "10.0.0.0/24",
"virtualNetworkAddressRange": "10.0.0.0/16",
"primaryAdIpAddress": "10.0.0.4",
"storageAccountType": "Standard_LRS",
"azureStackDNSIPAddress": "192.168.100.2",
"adTemplateURL": "[concat(variables('assetLocation'),'/adVmTemplate.json')]",
"adStorageName": "[tolower(concat('adsa',resourceGroup().name))]",
"dnsPrefix": "[concat('ADDNS',resourceGroup().name)]",
"dnsPrefix": "[tolower(concat(resourceGroup().name,'dc'))]",
"adVmDeployment": "CreateADVMs",
"adVmDeploymentId": "[concat('Microsoft.Resources/deployments/', variables('adVmDeployment'))]",
"adPDCVMName": "[concat('AD',resourceGroup().name)]",
@ -132,13 +131,7 @@
"id": "[variables('nsgID')]"
}
},
"subnets": "[variables('subnets')]",
"dhcpOptions": {
"dnsServers": [
"[variables('primaryAdIpAddress')]",
"[variables('azureStackDNSIPAddress')]"
]
}
"subnets": "[variables('subnets')]"
}
},
{
@ -294,8 +287,7 @@
"value": "[variables('subnets')]"
},
"dnsServerAddress": {
"value": [ "[variables('primaryAdIpAddress')]",
"[variables('azureStackDNSIPAddress')]" ]
"value": [ "[variables('primaryAdIpAddress')]" ]
}
}
}

Двоичные данные
sharepoint-2013-non-ha/InstallAndConfigureSharePointServer.ps1.zip
Просмотреть файл

Двоичный файл не отображается.

34
sharepoint-2013-non-ha/azuredeploy.json
Просмотреть файл

@ -29,6 +29,13 @@
"description": "The password for the Administrator account of the new VMs and Domain"
}
},
"sqlInstallationISOUri": {
"type": "string",
"metadata": {
"description": "The Uri to the SQL Server installation ISO. E.g http://care.dlservice.microsoft.com/dl/download/2/F/8/2F8F7165-BB21-4D1E-B5D8-3BD3CE73C77D/SQLServer2014SP1-FullSlipstream-x64-ENU.iso"
},
"defaultValue": "http://care.dlservice.microsoft.com/dl/download/2/F/8/2F8F7165-BB21-4D1E-B5D8-3BD3CE73C77D/SQLServer2014SP1-FullSlipstream-x64-ENU.iso"
},
"sharepoint2013SP1DownloadLink": {
"type": "string",
"metadata": {
@ -48,9 +55,9 @@
"adVMSize": "Standard_A1",
"sqlVMSize": "Standard_A2",
"spVMSize": "Standard_A3",
"spassetLocation": "https://raw.githubusercontent.com/Azure/AzureStack-QuickStart-Templates/master/sharepoint-2013-non-ha",
"adAssetLocation": "https://raw.githubusercontent.com/Azure/AzureStack-QuickStart-Templates/master/ad-non-ha",
"sqlAssetLocation": "https://raw.githubusercontent.com/Azure/AzureStack-QuickStart-Templates/master/sql-2014-non-ha",
"spassetLocation": "https://raw.githubusercontent.com/Azure/AzureStack-QuickStart-Templates/AzureStackTechnicalPreview2/sharepoint-2013-non-ha",
"adAssetLocation": "https://raw.githubusercontent.com/Azure/AzureStack-QuickStart-Templates/AzureStackTechnicalPreview2/ad-non-ha",
"sqlAssetLocation": "https://raw.githubusercontent.com/Azure/AzureStack-QuickStart-Templates/AzureStackTechnicalPreview2/sql-2014-non-ha",
"location": "[resourceGroup().location]",
"vmNetworkSubnet": "10.0.0.0/24",
"virtualNetworkAddressRange": "10.0.0.0/16",
@ -58,8 +65,8 @@
"sqlServerServiceAccountPassword": "[parameters('adminPassword')]",
"sharePointFarmAccountPassword": "[parameters('adminPassword')]",
"sharePointFarmPassphrasePassword": "[parameters('adminPassword')]",
"dnsPrefix": "[concat('SPADDNS',resourceGroup().name)]",
"spdnsPrefix": "[concat('SPDNS',resourceGroup().name)]",
"dnsPrefix": "[tolower(concat(resourceGroup().name, 'dc'))]",
"spdnsPrefix": "[tolower(concat(resourceGroup().name,'sp'))]",
"staticSubnetName": "[concat('SPSubNet',resourceGroup().name)]",
"virtualNetworkName": "[concat('SPVnet',resourceGroup().name)]",
"vnetID": "[resourceId('Microsoft.Network/virtualNetworks', variables('virtualNetworkName'))]",
@ -108,7 +115,6 @@
"rdpPort": 3389,
"publicBEAddressPoolID": "[concat(variables('publiclbID'),'/backendAddressPools/',variables('lbBE'))]",
"adRDPNATRuleID": "[concat(variables('publiclbID'),'/inboundNatRules/',variables('rpdNAT'))]",
"azureStackDNSIP": "192.168.100.2",
"nsgName": "[concat('SPNsg',resourceGroup().name)]",
"nsgID": "[resourceId('Microsoft.Network/networkSecurityGroups',variables('nsgName'))]",
"splbFE": "SPLBFE1",
@ -196,12 +202,7 @@
}
}
}
],
"dhcpOptions": {
"dnsServers": [
"[variables('azureStackDNSIP')]"
]
}
]
}
},
{
@ -551,8 +552,7 @@
},
"dnsServerAddress": {
"value": [
"[variables('primaryAdIpAddress')]",
"[variables('azureStackDNSIP')]"
"[variables('primaryAdIpAddress')]"
]
}
}
@ -579,6 +579,9 @@
"domainName": {
"value": "[parameters('domainName')]"
},
"sqlInstallationISOUri": {
"value": "[parameters('sqlInstallationISOUri')]"
},
"sqlServerServiceAccountUserName": {
"value": "[parameters('sqlServerServiceAccountUserName')]"
},
@ -677,6 +680,9 @@
},
"sharepoint2013SP1SourceDLLink": {
"value": "[parameters('sharepoint2013SP1DownloadLink')]"
},
"primaryAdIpAddress": {
"value": "[variables('primaryAdIpAddress')]"
}
}
}

3
sharepoint-2013-non-ha/azuredeploy.parameters.json
Просмотреть файл

@ -14,6 +14,9 @@
"adminPassword": {
"value": "GEN-PASSWORD"
},
"sqlInstallationISOUri": {
"value": "http://care.dlservice.microsoft.com/dl/download/2/F/8/2F8F7165-BB21-4D1E-B5D8-3BD3CE73C77D/SQLServer2014SP1-FullSlipstream-x64-ENU.iso"
},
"sharepoint2013SP1DownloadLink": {
"value": "####"
},

8
sharepoint-2013-non-ha/deploySharePointStandalone.json
Просмотреть файл

@ -65,6 +65,13 @@
"description": "Direct download link for the SharePoint 2013 SP1 trial ISO"
}
},
"primaryAdIpAddress": {
"type": "string",
"metadata": {
"description": "The address of Primary AD"
},
"defaultValue": "10.0.0.4"
},
"assetLocation": {
"type": "string",
"metadata": {
@ -94,6 +101,7 @@
"ConfigurationFunction": "[variables('deploySPStandaloneConfigurationFunction')]",
"Properties": {
"DomainName": "[parameters('domainName')]",
"primaryAdIpAddress": "[parameters('primaryAdIpAddress')]",
"AdminCreds": {
"UserName": "[parameters('adminUserName')]",
"Password": "PrivateSettingsRef:AdminPassword"

12
sharepoint-2013-non-ha/spVMTemplate.json
Просмотреть файл

@ -127,7 +127,17 @@
"privateIPAllocationMethod": "Dynamic",
"subnet": {
"id": "[parameters('subnetResourceId')]"
}
},
"loadBalancerBackendAddressPools": [
{
"id": "[parameters('lbBEPool')]"
}
],
"loadBalancerInboundNatRules": [
{
"id": "[parameters('rdpNATRuleID')]"
}
]
}
}
]

27
sql-2014-non-ha/azuredeploy.json
Просмотреть файл

@ -9,6 +9,13 @@
},
"defaultValue": "contoso.com"
},
"sqlInstallationISOUri": {
"type": "string",
"metadata": {
"description": "The Uri to the SQL Server installation ISO. E.g http://care.dlservice.microsoft.com/dl/download/2/F/8/2F8F7165-BB21-4D1E-B5D8-3BD3CE73C77D/SQLServer2014SP1-FullSlipstream-x64-ENU.iso"
},
"defaultValue": "http://care.dlservice.microsoft.com/dl/download/2/F/8/2F8F7165-BB21-4D1E-B5D8-3BD3CE73C77D/SQLServer2014SP1-FullSlipstream-x64-ENU.iso"
},
"sqlServerServiceAccountUserName": {
"type": "string",
"metadata": {
@ -48,8 +55,8 @@
"networkSecurityGroups": "2015-05-01-preview"
}
},
"sqlassetLocation": "https://raw.githubusercontent.com/Azure/AzureStack-QuickStart-Templates/master/sql-2014-non-ha",
"adAssetLocation": "https://raw.githubusercontent.com/Azure/AzureStack-QuickStart-Templates/master/ad-non-ha",
"sqlassetLocation": "https://raw.githubusercontent.com/Azure/AzureStack-QuickStart-Templates/AzureStackTechnicalPreview2/sql-2014-non-ha",
"adAssetLocation": "https://raw.githubusercontent.com/Azure/AzureStack-QuickStart-Templates/AzureStackTechnicalPreview2/ad-non-ha",
"location": "[resourceGroup().location]",
"sqlServerServiceAccountPassword": "[parameters('adminPassword')",
"vmNetworkSubnet": "10.0.0.0/24",
@ -59,7 +66,7 @@
"adVMSize": "Standard_A1",
"sqlVMSize": "Standard_A3",
"staticSubnetName": "[concat('SQLSub',resourceGroup().name)]",
"dnsPrefix": "[concat('SQLADDNS',resourceGroup().name)]",
"dnsPrefix": "[tolower(concat(resourceGroup().name,'dc'))]",
"virtualNetworkName": "[concat('SQLVNet',resourceGroup().name)]",
"vnetID": "[resourceId('Microsoft.Network/virtualNetworks', variables('virtualNetworkName'))]",
"staticSubnetID": "[concat(variables('vnetID'),'/subnets/',variables('staticSubnetName'))]",
@ -95,7 +102,6 @@
"rdpPort": 3389,
"publicBEAddressPoolID": "[concat(variables('publiclbID'),'/backendAddressPools/',variables('lbBE'))]",
"adRDPNATRuleID": "[concat(variables('publiclbID'),'/inboundNatRules/',variables('rpdNAT'))]",
"azureStackDNSIP": "192.168.100.2",
"adNICName": "[concat('SQLADNic',resourceGroup().name)]",
"sqlNICName": "[concat('SQLNic',resourceGroup().name)]",
"nsgName": "SQLNsg",
@ -160,12 +166,7 @@
}
}
}
],
"dhcpOptions": {
"dnsServers": [
"[variables('azureStackDNSIP')]"
]
}
]
}
},
{
@ -363,8 +364,7 @@
},
"dnsServerAddress": {
"value": [
"[variables('primaryIpADAddress')]",
"[variables('azureStackDNSIP')]"
"[variables('primaryIpADAddress')]"
]
}
}
@ -391,6 +391,9 @@
"domainName": {
"value": "[parameters('domainName')]"
},
"sqlInstallationISOUri": {
"value": "[parameters('sqlInstallationISOUri')]"
},
"sqlServerServiceAccountUserName": {
"value": "[parameters('sqlServerServiceAccountUserName')]"
},

3
sql-2014-non-ha/azuredeploy.parameters.json
Просмотреть файл

@ -13,6 +13,9 @@
},
"adminPassword": {
"value": "GEN-PASSWORD"
},
"sqlInstallationISOUri": {
"value": "http://care.dlservice.microsoft.com/dl/download/2/F/8/2F8F7165-BB21-4D1E-B5D8-3BD3CE73C77D/SQLServer2014SP1-FullSlipstream-x64-ENU.iso"
}
}
}

8
sql-2014-non-ha/deploySqlStandalone.json
Просмотреть файл

@ -14,6 +14,13 @@
"description": "The domain name"
}
},
"sqlInstallationISOUri": {
"type": "string",
"metadata": {
"description": "The Uri to the SQL Server installation ISO. E.g http://care.dlservice.microsoft.com/dl/download/2/F/8/2F8F7165-BB21-4D1E-B5D8-3BD3CE73C77D/SQLServer2014SP1-FullSlipstream-x64-ENU.iso"
},
"defaultValue": "http://care.dlservice.microsoft.com/dl/download/2/F/8/2F8F7165-BB21-4D1E-B5D8-3BD3CE73C77D/SQLServer2014SP1-FullSlipstream-x64-ENU.iso"
},
"sqlServerServiceAccountUserName": {
"type": "string",
"metadata": {
@ -76,6 +83,7 @@
"properties": {
"domainName": "[parameters('domainName')]",
"primaryAdIpAddress": "[parameters('primaryAdIpAddress')]",
"sqlInstallationISOUri": "[parameters('sqlInstallationISOUri')]",
"adminCreds": {
"userName": "[parameters('adminUserName')]",
"password": "PrivateSettingsRef:adminPassword"

Двоичные данные
sql-2014-non-ha/deploySqlStandalone.ps1.zip
Просмотреть файл

Двоичный файл не отображается.