Skip to content

Commit

Permalink
match psmp nested to tag
Browse files Browse the repository at this point in the history
  • Loading branch information
pelegor committed Dec 15, 2022
1 parent c7831fc commit ba48754
Show file tree
Hide file tree
Showing 4 changed files with 108 additions and 224 deletions.
113 changes: 0 additions & 113 deletions azure/nested/psmp-nested-template-since-v10.7.json

This file was deleted.

212 changes: 106 additions & 106 deletions azure/nested/psmp-nested-template.json
Original file line number Diff line number Diff line change
@@ -1,107 +1,107 @@
{
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"VMname": {
"type": "string"
},
"computerName": {
"type": "string"
},
"adminUsername": {
"type": "string"
},
"adminPassword": {
"type": "SecureString"
},
"vmSize": {
"type": "string"
},
"Imageid": {
"type": "string"
},
"AvailablitySetName": {
"type": "string"
},
"NetworkInterfaceName": {
"type": "string"
},
"VaultAdminUser": {
"type": "string"
},
"VaultAdminPassword": {
"type": "SecureString"
},
"VaultPrivateIP": {
"type": "string"
}
},
"variables": {
"GuidSubstring": "[uniqueString( resourceGroup().id, deployment().name )]"
},
"resources": [
{
"type": "Microsoft.Compute/virtualMachines",
"name": "[parameters('VMname')]",
"apiVersion": "2017-03-30",
"location": "[resourceGroup().location]",
"properties": {
"osProfile": {
"computerName": "[parameters('computerName')]",
"adminUsername": "[parameters('adminUsername')]",
"adminPassword": "[parameters('adminPassword')]"
},
"hardwareProfile": {
"vmSize": "[parameters('vmSize')]"
},
"storageProfile": {
"imageReference": {
"id": "[parameters('ImageID')]"
},
"osDisk": {
"createOption": "fromImage",
"managedDisk": {
"storageAccountType": "Premium_LRS"
}
}
},
"networkProfile": {
"networkInterfaces": [
{
"id": "[resourceId('Microsoft.Network/networkInterfaces', parameters('networkInterfaceName'))]"
}
]
},
"availabilitySet": {
"id": "[resourceId('Microsoft.Compute/availabilitySets', parameters('AvailablitySetName'))]"
}
},
"dependsOn": []
},
{
"type": "Microsoft.Compute/virtualMachines/extensions",
"name": "[concat(parameters('computerName'),'/', 'customscriptpsmp')]",
"apiVersion": "2015-06-15",
"location": "[resourceGroup().location]",
"tags": {
"displayName": "config-component-psmp"
},
"properties": {
"publisher": "Microsoft.Azure.Extensions",
"type": "CustomScript",
"typeHandlerVersion": "2.0",
"autoUpgradeMinorVersion": true,
"settings": {
"skipDos2Unix": false
},
"protectedSettings": {
"commandToExecute": "[concat('/etc/opt/register_and_activation.sh ', parameters('VaultAdminUser'), ' ', parameters('VaultAdminPassword'), ' ', parameters('VaultPrivateIP'),' ', variables('GuidSubstring'), ' ', parameters('adminUsername'))]",
"fileUris": []
}
},
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', parameters('computerName'))]"
]
}
]
{
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"VMname": {
"type": "string"
},
"computerName": {
"type": "string"
},
"adminUsername": {
"type": "string"
},
"adminPassword": {
"type": "SecureString"
},
"vmSize": {
"type": "string"
},
"Imageid": {
"type": "string"
},
"NetworkInterfaceName": {
"type": "string"
},
"VaultAdminUser": {
"type": "string"
},
"VaultAdminPassword": {
"type": "SecureString"
},
"AvailablitySetName": {
"type": "string"
},
"VaultPrivateIP": {
"type": "string"
}
},
"variables": {
"GuidSubstring": "[uniqueString( resourceGroup().id, deployment().name )]"
},
"resources": [
{
"type": "Microsoft.Compute/virtualMachines",
"name": "[parameters('VMname')]",
"apiVersion": "2017-03-30",
"location": "[resourceGroup().location]",
"properties": {
"osProfile": {
"computerName": "[parameters('computerName')]",
"adminUsername": "[parameters('adminUsername')]",
"adminPassword": "[parameters('adminPassword')]"
},
"hardwareProfile": {
"vmSize": "[parameters('vmSize')]"
},
"storageProfile": {
"imageReference": {
"id": "[parameters('ImageID')]"
},
"osDisk": {
"createOption": "fromImage",
"managedDisk": {
"storageAccountType": "Premium_LRS"
}
}
},
"availabilitySet": {
"id": "[resourceId('Microsoft.Compute/availabilitySets', parameters('AvailablitySetName'))]"
},
"networkProfile": {
"networkInterfaces": [
{
"id": "[resourceId('Microsoft.Network/networkInterfaces', parameters('networkInterfaceName'))]"
}
]
}
},
"dependsOn": []
},
{
"type": "Microsoft.Compute/virtualMachines/extensions",
"name": "[concat(parameters('computerName'),'/', 'customscriptpsmp')]",
"apiVersion": "2015-06-15",
"location": "[resourceGroup().location]",
"tags": {
"displayName": "config-component-psmp"
},
"properties": {
"publisher": "Microsoft.Azure.Extensions",
"type": "CustomScript",
"typeHandlerVersion": "2.0",
"autoUpgradeMinorVersion": true,
"settings": {
"skipDos2Unix": false
},
"protectedSettings": {
"commandToExecute": "[concat('/etc/opt/register_and_activation.sh ', parameters('VaultAdminUser'), ' ', parameters('VaultAdminPassword'), ' ', parameters('VaultPrivateIP'),' ', variables('GuidSubstring'), ' ', parameters('adminUsername'))]",
"fileUris": []
}
},
"dependsOn": [
"[concat('Microsoft.Compute/virtualMachines/', parameters('computerName'))]"
]
}
]
}
2 changes: 1 addition & 1 deletion azure/pas-single-component-deploy-in-customer-network.json
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
"properties": {
"mode": "Incremental",
"templateLink": {
"uri": "https://pasnestedtemplates.blob.core.windows.net/nested/psmp-nested-template-v11.3.json",
"uri": "https://raw.githubusercontent.com/cyberark/pas-on-cloud/v11.3/azure/nested/psmp-nested-template.json",
"contentVersion": "1.0.0.0"
},
"parameters": {
Expand Down
5 changes: 1 addition & 4 deletions azure/pas-single-component-deploy-in-pas-hybrid-network.json
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
"properties": {
"mode": "Incremental",
"templateLink": {
"uri": "https://pasnestedtemplates.blob.core.windows.net/nested/psmp-nested-template-v11.3.json",
"uri": "https://raw.githubusercontent.com/cyberark/pas-on-cloud/v11.3/azure/nested/psmp-nested-template.json",
"contentVersion": "1.0.0.0"
},
"parameters": {
Expand All @@ -132,9 +132,6 @@
"computerName": {
"value": "[parameters('Component VM Host Name')]"
},
"pvwaUrl": {
"value": "[parameters('Password Vault Web Access FQDN')]"
},
"adminUsername": {
"value": "[parameters('Component VM Admin User')]"
},
Expand Down

0 comments on commit ba48754

Please sign in to comment.