Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update SAP LaMa templates to include latest operation systems #13972

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update SAP LaMa templates to include latest operation systems #13972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
38 changes: 12 additions & 26 deletions application-workloads/sap/sap-lama-apps/azuredeploy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,12 @@
"osType": {
"type": "string",
"allowedValues": [
"Windows Server 2012 Datacenter",
"Windows Server 2012 R2 Datacenter",
"Windows Server 2016 Datacenter",
"SLES 12",
"Windows Server 2022 Datacenter",
"SLES 15",
"RHEL 7",
"Oracle Linux 7"
],
"defaultValue": "Windows Server 2016 Datacenter",
"defaultValue": "Windows Server 2022 Datacenter",
"metadata": {
"description": "The type of the operating system you want to deploy."
}
Expand Down Expand Up @@ -200,30 +198,16 @@
"variables": {
"selectedZones":"[if(equals(parameters('availabilityZone'),0), json('null'), array(parameters('availabilityZone')))]",
"images": {
"Windows Server 2012 Datacenter": {
"sku": "2012-Datacenter",
"Windows Server 2022 Datacenter": {
"sku": "2022-Datacenter",
"offer": "WindowsServer",
"publisher": "MicrosoftWindowsServer",
"OSType": "Windows",
"osDiskSize": 128
},
"Windows Server 2012 R2 Datacenter": {
"sku": "2012-R2-Datacenter",
"offer": "WindowsServer",
"publisher": "MicrosoftWindowsServer",
"OSType": "Windows",
"osDiskSize": 128
},
"Windows Server 2016 Datacenter": {
"sku": "2016-Datacenter",
"offer": "WindowsServer",
"publisher": "MicrosoftWindowsServer",
"OSType": "Windows",
"osDiskSize": 128
},
"SLES 12": {
"sku": "12-SP3",
"offer": "SLES-SAP",
"SLES 15": {
"sku": "gen1",
"offer": "sles-sap-15-sp5",
"publisher": "SUSE",
"OSType": "Linux",
"osDiskSize": 128
Expand Down Expand Up @@ -261,7 +245,7 @@
"Name": "CustomScriptExtension",
"Version": "1.7",
"script": "[uri(parameters('_artifactsLocation'), concat('scripts/diskConfig.ps1', parameters('_artifactsLocationSasToken')))]",
"scriptCall": "powershell.exe -ExecutionPolicy bypass -File scripts/diskConfig.ps1",
"scriptCall": "powershell.exe -ExecutionPolicy bypass -File diskConfig.ps1",
"disks": [
{
"lun": 0,
Expand All @@ -278,7 +262,9 @@
"Name": "CustomScript",
"Version": "2.0",
"script": "[uri(parameters('_artifactsLocation'), concat('scripts/diskConfig.sh', parameters('_artifactsLocationSasToken')))]",
"scriptCall": "sh diskConfig.sh"
"scriptCall": "sh diskConfig.sh",
"disks": [
]
}
},
"cseExtPublisher": "[variables('osConfigs')[variables('internalOSType')].Publisher]",
Expand Down
2 changes: 1 addition & 1 deletion application-workloads/sap/sap-lama-apps/nestedtemplates/installHostAgent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
"variables": {
"commands": {
"Linux": "[concat('groupadd -g ', parameters('sapsysGid') , ' sapsys; useradd -u ', parameters('sapadmId') , ' -g ', parameters('sapsysGid') , ' sapadm; ./', parameters('sapcarFilename'), ' -xvf ', parameters('sapHostAgentArchiveFilename'), ' -R hostagent; pushd hostagent; ./saphostexec -install; popd; /usr/sap/hostctrl/exe/sapacosprep -a InstallAcExt -m ', parameters('sapacExtArchiveFilename'), '; echo ''sapadm:', parameters('sapadmPassword'), ''' | chpasswd')]",
"Windows": "[concat('.\\', parameters('vcRedistFilename'), ' /q /norestart /log vcredistinstall.log & .\\', parameters('sapcarFilename'), ' -xvf ', parameters('sapHostAgentArchiveFilename'), ' -R hostagent & pushd hostagent & echo ', parameters('sapadmPassword') , '| .\\saphostexec.exe -install & popd & \"C:\\Program Files\\SAP\\hostctrl\\exe\\sapacosprep.exe\" -a InstallAcExt -m ', parameters('sapacExtArchiveFilename'), '')]"
"Windows": "[concat('.\\', parameters('vcRedistFilename'), ' /q /norestart /log vcredistinstall.log & .\\', parameters('sapcarFilename'), ' -xvf ', parameters('sapHostAgentArchiveFilename'), ' -R hostagent & pushd hostagent & echo ', parameters('sapadmPassword') , '| .\\saphostexec.exe -install & popd & \"C:\\Program Files\\SAP\\hostctrl\\exe\\sapacosprep.exe\" -a InstallAcExt -m .\\', parameters('sapacExtArchiveFilename'), '')]"
},
"files": {
"Linux": [
Expand Down
34 changes: 9 additions & 25 deletions application-workloads/sap/sap-lama-ascs/azuredeploy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,12 @@
"osType": {
"type": "string",
"allowedValues": [
"Windows Server 2012 Datacenter",
"Windows Server 2012 R2 Datacenter",
"Windows Server 2016 Datacenter",
"SLES 12",
"Windows Server 2022 Datacenter",
"SLES 15",
"RHEL 7",
"Oracle Linux 7"
],
"defaultValue": "Windows Server 2016 Datacenter",
"defaultValue": "Windows Server 2022 Datacenter",
"metadata": {
"description": "The type of the operating system you want to deploy."
}
Expand Down Expand Up @@ -181,30 +179,16 @@
"variables": {
"selectedZones":"[if(equals(parameters('availabilityZone'),0), json('null'), array(parameters('availabilityZone')))]",
"images": {
"Windows Server 2012 Datacenter": {
"sku": "2012-Datacenter",
"Windows Server 2022 Datacenter": {
"sku": "2022-Datacenter",
"offer": "WindowsServer",
"publisher": "MicrosoftWindowsServer",
"OSType": "Windows",
"osDiskSize": 128
},
"Windows Server 2012 R2 Datacenter": {
"sku": "2012-R2-Datacenter",
"offer": "WindowsServer",
"publisher": "MicrosoftWindowsServer",
"OSType": "Windows",
"osDiskSize": 128
},
"Windows Server 2016 Datacenter": {
"sku": "2016-Datacenter",
"offer": "WindowsServer",
"publisher": "MicrosoftWindowsServer",
"OSType": "Windows",
"osDiskSize": 128
},
"SLES 12": {
"sku": "12-SP3",
"offer": "SLES-SAP",
"SLES 15": {
"sku": "gen1",
"offer": "sles-sap-15-sp5",
"publisher": "SUSE",
"OSType": "Linux",
"osDiskSize": 128
Expand Down Expand Up @@ -242,7 +226,7 @@
"Name": "CustomScriptExtension",
"Version": "1.7",
"script": "[uri(parameters('_artifactsLocation'), concat('scripts/diskConfig.ps1', parameters('_artifactsLocationSasToken')))]",
"scriptCall": "powershell.exe -ExecutionPolicy bypass -File scripts/diskConfig.ps1",
"scriptCall": "powershell.exe -ExecutionPolicy bypass -File diskConfig.ps1",
"disks": [
{
"lun": 0,
Expand Down
2 changes: 1 addition & 1 deletion application-workloads/sap/sap-lama-ascs/nestedtemplates/installHostAgent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
"variables": {
"commands": {
"Linux": "[concat('groupadd -g ', parameters('sapsysGid') , ' sapsys; useradd -u ', parameters('sapadmId') , ' -g ', parameters('sapsysGid') , ' sapadm; ./', parameters('sapcarFilename'), ' -xvf ', parameters('sapHostAgentArchiveFilename'), ' -R hostagent; pushd hostagent; ./saphostexec -install; popd; /usr/sap/hostctrl/exe/sapacosprep -a InstallAcExt -m ', parameters('sapacExtArchiveFilename'), '; echo ''sapadm:', parameters('sapadmPassword'), ''' | chpasswd')]",
"Windows": "[concat('.\\', parameters('vcRedistFilename'), ' /q /norestart /log vcredistinstall.log & .\\', parameters('sapcarFilename'), ' -xvf ', parameters('sapHostAgentArchiveFilename'), ' -R hostagent & pushd hostagent & echo ', parameters('sapadmPassword') , '| .\\saphostexec.exe -install & popd & \"C:\\Program Files\\SAP\\hostctrl\\exe\\sapacosprep.exe\" -a InstallAcExt -m ', parameters('sapacExtArchiveFilename'), '')]"
"Windows": "[concat('.\\', parameters('vcRedistFilename'), ' /q /norestart /log vcredistinstall.log & .\\', parameters('sapcarFilename'), ' -xvf ', parameters('sapHostAgentArchiveFilename'), ' -R hostagent & pushd hostagent & echo ', parameters('sapadmPassword') , '| .\\saphostexec.exe -install & popd & \"C:\\Program Files\\SAP\\hostctrl\\exe\\sapacosprep.exe\" -a InstallAcExt -m .\\', parameters('sapacExtArchiveFilename'), '')]"
},
"files": {
"Linux": [
Expand Down
34 changes: 9 additions & 25 deletions application-workloads/sap/sap-lama-database/azuredeploy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,12 @@
"osType": {
"type": "string",
"allowedValues": [
"Windows Server 2012 Datacenter",
"Windows Server 2012 R2 Datacenter",
"Windows Server 2016 Datacenter",
"SLES 12",
"Windows Server 2022 Datacenter",
"SLES 15",
"RHEL 7",
"Oracle Linux 7"
],
"defaultValue": "Windows Server 2016 Datacenter",
"defaultValue": "Windows Server 2022 Datacenter",
"metadata": {
"description": "The type of the operating system you want to deploy."
}
Expand Down Expand Up @@ -185,30 +183,16 @@
},
"variables": {
"images": {
"Windows Server 2012 Datacenter": {
"sku": "2012-Datacenter",
"Windows Server 2022 Datacenter": {
"sku": "2022-Datacenter",
"offer": "WindowsServer",
"publisher": "MicrosoftWindowsServer",
"OSType": "Windows",
"osDiskSize": 128
},
"Windows Server 2012 R2 Datacenter": {
"sku": "2012-R2-Datacenter",
"offer": "WindowsServer",
"publisher": "MicrosoftWindowsServer",
"OSType": "Windows",
"osDiskSize": 128
},
"Windows Server 2016 Datacenter": {
"sku": "2016-Datacenter",
"offer": "WindowsServer",
"publisher": "MicrosoftWindowsServer",
"OSType": "Windows",
"osDiskSize": 128
},
"SLES 12": {
"sku": "12-SP3",
"offer": "SLES-SAP",
"SLES 15": {
"sku": "gen1",
"offer": "sles-sap-15-sp5",
"publisher": "SUSE",
"OSType": "Linux",
"osDiskSize": 128
Expand Down Expand Up @@ -246,7 +230,7 @@
"Name": "CustomScriptExtension",
"Version": "1.7",
"script": "[uri(parameters('_artifactsLocation'), concat('scripts/diskConfig.ps1', parameters('_artifactsLocationSasToken')))]",
"scriptCall": "powershell.exe -ExecutionPolicy bypass -File scripts/diskConfig.ps1"
"scriptCall": "powershell.exe -ExecutionPolicy bypass -File diskConfig.ps1"
},
"Linux": {
"Publisher": "Microsoft.Azure.Extensions",
Expand Down
2 changes: 1 addition & 1 deletion application-workloads/sap/sap-lama-database/nestedtemplates/installHostAgent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
"variables": {
"commands": {
"Linux": "[concat('groupadd -g ', parameters('sapsysGid') , ' sapsys; useradd -u ', parameters('sapadmId') , ' -g ', parameters('sapsysGid') , ' sapadm; ./', parameters('sapcarFilename'), ' -xvf ', parameters('sapHostAgentArchiveFilename'), ' -R hostagent; pushd hostagent; ./saphostexec -install; popd; /usr/sap/hostctrl/exe/sapacosprep -a InstallAcExt -m ', parameters('sapacExtArchiveFilename'), '; echo ''sapadm:', parameters('sapadmPassword'), ''' | chpasswd')]",
"Windows": "[concat('.\\', parameters('vcRedistFilename'), ' /q /norestart /log vcredistinstall.log & .\\', parameters('sapcarFilename'), ' -xvf ', parameters('sapHostAgentArchiveFilename'), ' -R hostagent & pushd hostagent & echo ', parameters('sapadmPassword') , '| .\\saphostexec.exe -install & popd & \"C:\\Program Files\\SAP\\hostctrl\\exe\\sapacosprep.exe\" -a InstallAcExt -m ', parameters('sapacExtArchiveFilename'), '')]"
"Windows": "[concat('.\\', parameters('vcRedistFilename'), ' /q /norestart /log vcredistinstall.log & .\\', parameters('sapcarFilename'), ' -xvf ', parameters('sapHostAgentArchiveFilename'), ' -R hostagent & pushd hostagent & echo ', parameters('sapadmPassword') , '| .\\saphostexec.exe -install & popd & \"C:\\Program Files\\SAP\\hostctrl\\exe\\sapacosprep.exe\" -a InstallAcExt -m .\\', parameters('sapacExtArchiveFilename'), '')]"
},
"files": {
"Linux": [
Expand Down