Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
832d16b
Added wrapper template to create fileshare storage account for data m…
venu-sivanadham Oct 28, 2020
a31aa46
Seperated custom script extension from vmss template
venu-sivanadham Oct 29, 2020
e5bfd70
Fixed the type propety value in webvmss-setup.json template
venu-sivanadham Oct 29, 2020
5dd8a50
Reverted the custom script extension seperation logic
venu-sivanadham Jan 22, 2021
79aefdd
provision to create azure fileshare storage account independently
venu-sivanadham Jan 22, 2021
cb5e8ac
provision to create azure fileshare storage account independently
venu-sivanadham Jan 22, 2021
f3e8a1c
relocated file share storage account deployment template
venu-sivanadham Jan 22, 2021
0ac4804
fixed storage account name arguments
venu-sivanadham Jan 22, 2021
17993ed
restored original storage account template
venu-sivanadham Jan 22, 2021
6dfd3cf
dedicated entry point templates for migration
venu-sivanadham Jan 23, 2021
78753cc
fixed parameter alignment for migration template
venu-sivanadham Jan 23, 2021
a174787
fixed scripts to handle existing moodle share in migration flow
venu-sivanadham Jan 23, 2021
0aeb278
minor fixs: tabs to spaces, log sentance corrections
venu-sivanadham Jan 23, 2021
289afe8
Merge pull request #1 from venu-sivanadham/MigrationDevelop
venu-sivanadham Jan 23, 2021
b244f89
Migration Flow: Moodle DB import functionality
venu-sivanadham Jan 25, 2021
1dbcf95
Merge pull request #2 from venu-sivanadham/MigrationDevelop
venu-sivanadham Jan 25, 2021
e0c209e
fixed syntax error
venu-sivanadham Jan 25, 2021
f749774
Merge pull request #3 from venu-sivanadham/MigrationDevelop
venu-sivanadham Jan 25, 2021
e64e191
added php version input parameter and other minor fixes
venu-sivanadham Jan 25, 2021
e907cc6
Merge pull request #4 from venu-sivanadham/MigrationDevelop
venu-sivanadham Jan 25, 2021
f5484e6
included escape chars for config value replacement
venu-sivanadham Jan 25, 2021
3cb9fac
Merge pull request #5 from venu-sivanadham/MigrationDevelop
venu-sivanadham Jan 25, 2021
345bf78
Fixed sql tarball name in install-moodle.sh (#7)
shishir-msft Feb 1, 2021
0f4ff9f
Changes for WB compatibility (#8)
shishir-msft Feb 22, 2021
63e5e7b
Update azure-fileshare-sa-deploy.json
shishir-msft Feb 24, 2021
a87fd02
Update storageAccount.json
shishir-msft Feb 24, 2021
c23da44
Fixed mysql import db
shishir-msft Feb 25, 2021
ce73d92
Update install_moodle.sh
shishir-msft Feb 25, 2021
5121752
Update storageAccount.json
shishir-msft Feb 25, 2021
2e96160
Use nearest prod region if deployment resource group location is east…
venu-sivanadham Feb 26, 2021
1630d4d
Merge pull request #9 from venu-sivanadham/euap_region_fix
venu-sivanadham Feb 26, 2021
46fc6c0
Update azuredeploy-migration.json
shishir-msft Mar 4, 2021
5c384fe
Update azure-fileshare-sa-deploy.json
shishir-msft Mar 4, 2021
9b0bc75
Update azuredeploy-migration.json (#10)
shishir-msft Mar 10, 2021
0625f6e
Revert "Update azuredeploy-migration.json (#10)" (#11)
shishir-msft Mar 11, 2021
3acd658
Mapping unsupported regions to default region 'southeastasia'
venu-sivanadham Mar 18, 2021
e2ec9c8
Making 'westus' as default location for migration templates
venu-sivanadham Mar 26, 2021
c0ce0c8
Changed artifacts location to point to main Azure Moodle branch
venu-sivanadham Mar 30, 2021
609cad6
Merge branch 'merge_to_moodle_master' into migration_conflicts_resolved
venu-sivanadham Apr 1, 2021
cb29157
Merge pull request #12 from Azure/migration_conflicts_resolved
venu-sivanadham Apr 1, 2021
70c6bb4
Addressed review comments
venu-sivanadham Apr 8, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 26 additions & 4 deletions azuredeploy.json
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,20 @@
},
"type": "string"
},
"moodleDbName": {
"defaultValue": "moodle",
"metadata": {
"description": "Moodle Database name"
},
"type": "string"
},
"moodleDbUser": {
"defaultValue": "moodle",
"metadata": {
"description": "Moodle Database username. This user is different from Database admin user."
},
"type": "string"
},
"mysqlPgresVcores": {
"allowedValues": [
1,
Expand Down Expand Up @@ -671,6 +685,13 @@
"metadata": {
"description": "Azure Location for all resources."
}
},
"isMigration": {
"type": "bool",
"defaultValue": false,
"metadata": {
"description": "Indicates whether the this template is using for migration scenario."
}
}
},
"resources": [
Expand Down Expand Up @@ -1189,10 +1210,10 @@
"lbOutPipName002": "[concat('lb-outpubip002-',variables('resourceprefix'))]",
"location": "[parameters('location')]",
"moodleAdminPass": "[concat(toUpper('xl'), substring(uniqueString(resourceGroup().id, deployment().name), 6, 7),',1*8')]",
"moodleDbName": "moodle",
"moodleDbName": "[parameters('moodleDbName')]",
"moodleDbPass": "[concat('9#36^', substring(uniqueString(resourceGroup().id, deployment().name), 5, 8), toUpper('ercq'))]",
"moodleDbUser": "moodle",
"moodleDbUserAzure": "[concat('moodle', '@', parameters('dbServerType'), '-', variables('resourceprefix'))]",
"moodleDbUser": "[parameters('moodleDbUser')]",
"moodleDbUserAzure": "[concat(parameters('moodleDbUser'), '@', parameters('dbServerType'), '-', variables('resourceprefix'))]",
"moodleInstallScriptFilename": "install_moodle.sh",
"moodleOnAzureConfigsJsonPath": "/var/lib/cloud/instance/moodle_on_azure_configs.json",
"moodleVersion": "[parameters('moodleVersion')]",
Expand Down Expand Up @@ -1271,7 +1292,8 @@
"vnetName": "[concat('vnet-',variables('resourceprefix'))]",
"vpnType": "[parameters('vpnType')]",
"webServerSetupScriptFilename": "setup_webserver.sh",
"webServerType": "[parameters('webServerType')]"
"webServerType": "[parameters('webServerType')]",
"isMigration": "[parameters('isMigration')]"
},
"certUrlArray": [
{
Expand Down
94 changes: 94 additions & 0 deletions migration/azure-fileshare-sa-deploy.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
{
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"storageAccountType": {
"defaultValue": "Premium_LRS",
"allowedValues": [
"Standard_LRS",
"Standard_GRS",
"Standard_ZRS",
"Premium_LRS"
],
"metadata": {
"description": "Storage Account type."
},
"type": "string"
},
"fileServerDiskSize": {
"defaultValue": "1024",
"metadata": {
"description": "Size of the azure file share in GB."
},
"type": "string"
}
},
"resources": [
{
"type": "Microsoft.Resources/deployments",
"apiVersion": "2017-05-10",
"name": "storageAccountTemplate",
"properties": {
"mode": "Incremental",
"parameters": {
"moodleCommon": {
"value": "[variables('moodleCommon')]"
}
},
"templateLink": {
"uri": "[concat(variables('moodleCommon').baseTemplateUrl,'storageAccount.json',variables('moodleCommon').artifactsSasToken)]"
}
}
},
{
"type": "Microsoft.Storage/storageAccounts/fileServices/shares",
"apiVersion": "2019-06-01",
"name": "[concat(variables('storageName'), '/default/moodle')]",
"dependsOn": [
"Microsoft.Resources/deployments/storageAccountTemplate"
],
"properties": {
"accessTier": "[if(equals(variables('moodleCommon').storageAccountType, 'Premium_LRS'), 'Premium', 'TransactionOptimized')]",
"shareQuota": "[int(variables('moodleCommon').fileServerDiskSize)]",
"enabledProtocols": "SMB"
}
}
],
"outputs": {
"storageAccountName": {
"type": "string",
"value": "[variables('moodleCommon').storageAccountName]"
},
"storageAccountType": {
"type": "string",
"value": "[variables('moodleCommon').storageAccountType]"
},
"fileServerDiskSize": {
"type": "string",
"value": "[variables('moodleCommon').fileServerDiskSize]"
}
},
"variables": {
"_artifactsLocation": "https://raw.githubusercontent.com/Azure/Moodle/master/",
"_artifactsLocationSasToken": "",
"unsupportedLocations": [
"eastus2euap",
"westcentralus"
],
"documentationLine1": "Some of the Azure Services used by moodle migration are not available in few regions. Those regions are declared above.",
"documentationLine2": "If resource group belong to one of those unsupported regions, then use default region 'westus' for deployment.",
"rgLocation": "[toLower(resourceGroup().location)]",
"location": "[if(contains(variables('unsupportedLocations'), variables('rgLocation')), 'westus', variables('rgLocation'))]",
"moodleCommon": {
"baseTemplateUrl": "[concat(variables('_artifactsLocation'), 'nested/')]",
"artifactsSasToken": "[variables('_artifactsLocationSasToken')]",
"fileServerType": "azurefiles",
"location": "[variables('location')]",
"storageAccountName": "[tolower(concat('abs',variables('resourceprefix')))]",
"storageAccountType": "[parameters('storageAccountType')]",
"fileServerDiskSize": "[parameters('fileServerDiskSize')]"
},
"resourceprefix": "[substring(uniqueString(resourceGroup().id, 'mainTemplate'), 3, 6)]",
"storageName": "[concat(variables('moodleCommon').storageAccountName,if(equals(variables('moodleCommon').fileServerType, 'azurefiles'), 'af', 'naf'))]"
}
}
Loading