This commit is contained in:
Jorge Cotillo 2019-08-26 08:14:39 -07:00
Родитель e382eee5cc
Коммит cfd3849b34
4 изменённых файлов: 15 добавлений и 26 удалений

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

@ -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,32 +1933,21 @@
"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"
"Name": "[parameters('domainName')]",
"OUPath": "",
"User": "[variables('domainAndUsername')]",
"Restart": "true",
"Options": 3
},
"configurationArguments": {
"DomainName": "[parameters('domainName')]",
"ServerName": "[concat(parameters('virtualMachineName'), copyIndex(parameters('virtualMachineOffset')))]"
}
},
"protectedSettings": {
"configurationUrlSasToken": "[variables('artifactsStorageAccountSasToken')]",
"configurationArguments": {
"AdminCreds": {
"UserName": "[parameters('domainAdminUsername')]",
"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 `