зеркало из https://github.com/Azure/vdc.git
replaced extension
This commit is contained in:
Родитель
e382eee5cc
Коммит
cfd3849b34
|
@ -234,8 +234,7 @@
|
|||
"tagPatching": "3rdSat7pm",
|
||||
"DSCExtensionName": "DSCExtension",
|
||||
"joinToDomainExtensionName": "JoinToDomainExtension",
|
||||
"domainAndUsername": "[concat(parameters('domainName'), '\\', parameters('domainAdminUsername'))]",
|
||||
"artifactsStorageAccountSasToken": "[concat('?', parameters('artifactsStorageAccountSasKey'))]"
|
||||
"domainAndUsername": "[concat(parameters('domainName'), '\\', parameters('domainAdminUsername'))]"
|
||||
},
|
||||
"resources": [
|
||||
{
|
||||
|
|
|
@ -313,6 +313,7 @@
|
|||
}
|
||||
]
|
||||
},
|
||||
"domainAndUsername": "[concat(parameters('domainName'), '\\', parameters('domainAdminUsername'))]",
|
||||
"artifactsStorageAccountSasToken": "[concat('?', parameters('artifactsStorageAccountSasKey'))]"
|
||||
},
|
||||
"resources": [
|
||||
|
@ -1932,29 +1933,18 @@
|
|||
"apiVersion": "2017-03-30",
|
||||
"location": "[parameters('location')]",
|
||||
"properties": {
|
||||
"publisher": "Microsoft.Powershell",
|
||||
"type": "DSC",
|
||||
"typeHandlerVersion": "2.9",
|
||||
"autoUpgradeMinorVersion": true,
|
||||
"publisher": "Microsoft.Compute",
|
||||
"type": "JsonADDomainExtension",
|
||||
"typeHandlerVersion": "1.3",
|
||||
"settings": {
|
||||
"configuration": {
|
||||
"url": "[concat('https://', parameters('artifactsStorageAccountName'), '.blob.core.windows.net/scripts/Windows/joinComputerToDomain.zip')]",
|
||||
"script": "joinComputerToDomain.ps1",
|
||||
"function": "JoinComputerToDomain"
|
||||
},
|
||||
"configurationArguments": {
|
||||
"DomainName": "[parameters('domainName')]",
|
||||
"ServerName": "[concat(parameters('virtualMachineName'), copyIndex(parameters('virtualMachineOffset')))]"
|
||||
}
|
||||
"Name": "[parameters('domainName')]",
|
||||
"OUPath": "",
|
||||
"User": "[variables('domainAndUsername')]",
|
||||
"Restart": "true",
|
||||
"Options": 3
|
||||
},
|
||||
"protectedSettings": {
|
||||
"configurationUrlSasToken": "[variables('artifactsStorageAccountSasToken')]",
|
||||
"configurationArguments": {
|
||||
"AdminCreds": {
|
||||
"UserName": "[parameters('domainAdminUsername')]",
|
||||
"Password": "[parameters('domainAdminPassword')]"
|
||||
}
|
||||
}
|
||||
"protectedsettings": {
|
||||
"Password": "[parameters('domainAdminPassword')]"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -211,11 +211,11 @@ Class AzureResourceManagerDeploymentService: IDeploymentService {
|
|||
# Only two failures can result:
|
||||
# 1. Template / Parameters Validation failure
|
||||
# 2. Deployment failure
|
||||
Write-Host "Running a deployment ...";
|
||||
Write-Host "Running a deployment ..." -ForegroundColor Yellow;
|
||||
$this.WaitForDeploymentToComplete(
|
||||
$deployment,
|
||||
$this.isSubscriptionDeployment);
|
||||
Write-Host "Deployment complete";
|
||||
Write-Host "Deployment complete" -ForegroundColor Yellow;
|
||||
}
|
||||
return $deployment;
|
||||
}
|
||||
|
|
|
@ -134,7 +134,7 @@ Function New-Deployment {
|
|||
}
|
||||
|
||||
foreach($ModuleConfigurationName in $allModules) {
|
||||
Write-Host "Deploying Module: $ModuleConfigurationName"
|
||||
Write-Host "Deploying Module: $ModuleConfigurationName" -ForegroundColor Yellow
|
||||
$moduleConfiguration = `
|
||||
Get-ModuleConfiguration `
|
||||
-ArchetypeInstanceJson $archetypeInstanceJson `
|
||||
|
|
Загрузка…
Ссылка в новой задаче