From ed536c22d2107863199ebf1c74957843839776c8 Mon Sep 17 00:00:00 2001
From: Michael Mergell <mimergel@microsoft.com>
Date: Wed, 24 Nov 2021 17:28:54 +0100
Subject: [PATCH 01/19] added azure devopos pipelines

---
 deploy/pipelines/01-prepare-region.yaml       | 111 ++++++
 deploy/pipelines/02-sap-workload-zone.yaml    | 100 +++++
 .../pipelines/03-sap-system-deployment.yaml   | 101 +++++
 .../pipelines/04-sap-binary-processing.yaml   |  94 +++++
 deploy/pipelines/05-DB-and-SAP-install.yaml   | 359 ++++++++++++++++++
 5 files changed, 765 insertions(+)
 create mode 100644 deploy/pipelines/01-prepare-region.yaml
 create mode 100644 deploy/pipelines/02-sap-workload-zone.yaml
 create mode 100644 deploy/pipelines/03-sap-system-deployment.yaml
 create mode 100644 deploy/pipelines/04-sap-binary-processing.yaml
 create mode 100644 deploy/pipelines/05-DB-and-SAP-install.yaml

diff --git a/deploy/pipelines/01-prepare-region.yaml b/deploy/pipelines/01-prepare-region.yaml
new file mode 100644
index 0000000000..243397f7d2
--- /dev/null
+++ b/deploy/pipelines/01-prepare-region.yaml
@@ -0,0 +1,111 @@
+# Starter pipeline
+# Start with a minimal pipeline that you can customize to build and deploy your code.
+# Add steps that build, run tests, deploy, and more:
+# https://aka.ms/yaml
+
+parameters:
+
+- name: deployer_parameter
+  displayName: ENV-LOCA-VNET-INFRASTRUCTURE
+  type: string
+  default: MGMT-WEEU-DEP00-INFRASTRUCTURE
+
+- name: library_parameter
+  displayName: ENV-LOCA-SAP_LIBRARY
+  type: string
+  default: MGMT-WEEU-SAP_LIBRARY
+
+- name: cleanup
+  displayName: Remove the relevant Resource Groups instead of deploying
+  type: boolean
+  default: False
+
+trigger:
+  none
+
+pool:
+  vmImage: ubuntu-latest
+
+variables:
+  deployerfolder: ${{ parameters.deployer_parameter }}
+  deployerconfig: ${{ parameters.deployer_parameter }}.tfvars
+  libraryfolder: ${{ parameters.library_parameter }}
+  libraryconfig: ${{ parameters.library_parameter }}.tfvars
+  log: logfile_$(Build.BuildId)
+
+name: $(deployerfolder)_$(libraryfolder)__Cleanup_${{ parameters.cleanup }}_$(SourceBranchName)_$(Date:yyyyMMdd)$(Rev:.r)
+
+stages:
+- stage: Prepare_the_Region_with_Deployer_and_SAP_Library
+  condition: eq(${{ parameters.cleanup }}, false)
+  jobs:
+  - job: Prepare_the_Region_with_Deployer_and_SAP_Library
+    steps:
+    - script: |
+        #!/bin/bash
+        green="\e[1;32m"
+        reset="\e[0m"
+        echo -e "$green--- Install Terraform ---$reset"
+          wget -q https://releases.hashicorp.com/terraform/1.0.8/terraform_1.0.8_linux_amd64.zip
+          unzip -qq terraform_1.0.8_linux_amd64.zip
+          sudo mv terraform /bin/ ; rm terraform_1.0.8_linux_amd64.zip
+        echo -e "$green--- Clone the $(Branch) branch of repository $(Repository) ---$reset"
+          git clone --quiet --single-branch --branch $(Branch) $(Repository)
+        echo -e "$green--- Update .sap_deployment_automation/config as DEPLOYMENT_REPO_PATH can change on devops agent ---$reset"
+          export DEPLOYMENT_REPO_PATH=$(Build.Repository.LocalPath)/sap-automation
+          mkdir -p .sap_deployment_automation
+          echo DEPLOYMENT_REPO_PATH=$DEPLOYMENT_REPO_PATH > .sap_deployment_automation/config
+          export HOME=$(Build.Repository.LocalPath)
+          az login --service-principal --username $(ARM_CLIENT_ID) --password $(ARM_CLIENT_SECRET) --tenant $(ARM_TENANT_ID)
+          az account set --subscription $(ARM_SUBSCRIPTION_ID)
+        echo -e "$green--- Prepare the exchange of information from devops agent back to the repository ---$reset"
+          organization=$(echo $(System.CollectionUri) | cut -d'/' -f4)
+          git config  http.https://$organization@dev.azure.com/$organization/$(System.TeamProject)/_git/$(Build.Repository.Name).extraheader "AUTHORIZATION: bearer $SYSTEM_ACCESSTOKEN"
+        echo -e "$green--- Convert config files to UX format ---$reset"
+          sudo apt-get -qq install dos2unix
+          dos2unix -q DEPLOYER/$(deployerfolder)/$(deployerconfig)
+          dos2unix -q LIBRARY/$(libraryfolder)/$(libraryconfig)
+        echo -e "$green--- Running the prepare region script that deploys the subscription hub with the Deployer VM and SAP Library ---$reset"
+          $DEPLOYMENT_REPO_PATH/deploy/scripts/prepare_region.sh --deployer_parameter_file DEPLOYER/$(deployerfolder)/$(deployerconfig) --library_parameter_file LIBRARY/$(libraryfolder)/$(libraryconfig)  --subscription $(ARM_SUBSCRIPTION_ID)  --spn_id $(ARM_CLIENT_ID) --spn_secret $(ARM_CLIENT_SECRET) --tenant_id $(ARM_TENANT_ID)  --auto-approve   &>> /tmp/$(log)1
+          cat /tmp/$(log)1
+          # currently error log piped to file to avoid pipeline failure due to bash error messages
+        echo -e "$green--- Adding deployment automation configuration to devops repository ---$reset"
+          git config --global user.email "$(Build.RequestedForEmail)"
+          git config --global user.name "$(Build.RequestedFor)"
+          git add .sap_deployment_automation                     &>> /tmp/$(log)2
+          git add DEPLOYER/$(deployerfolder)/.terraform          &>> /tmp/$(log)2
+          git add LIBRARY/$(libraryfolder)/.terraform            &>> /tmp/$(log)2
+          git add LIBRARY/$(libraryfolder)/backend-config.tfvars &>> /tmp/$(log)2
+          git commit -m "Added updates from devops deployment $(Build.DefinitionName) [skip ci]" &>> /tmp/$(log)2
+          git push -f origin HEAD:main                           &>> /tmp/$(log)2
+          cat /tmp/$(log)2
+        git config --unset-all http.https://$organization@dev.azure.com/$organization/$(System.TeamProject)/_git/$(Build.Repository.Name).extraheader
+      displayName: Prepare_the_Region_with_Deployer_and_SAP_Library
+      env:
+          SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+      failOnStderr: true
+
+- stage: Cleanup_Deployer_Library
+  condition: eq(${{ parameters.cleanup }}, true)
+  jobs:
+  - job: Remove_Deployer
+    steps:
+    - task: AzureResourceManagerTemplateDeployment@3
+      displayName: 'Remove Resource Group $(deployerfolder)'
+      inputs:
+        deploymentScope: 'Resource Group'
+        azureResourceManagerConnection: '$(AZURECONNECTIONNAME)'
+        subscriptionId: '$(ARM_SUBSCRIPTION_ID)'
+        action: 'DeleteRG'
+        resourceGroupName: '$(deployerfolder)'
+
+  - job: Remove_SAP_Library
+    steps:
+    - task: AzureResourceManagerTemplateDeployment@3
+      displayName: 'Remove Resource Group $(libraryfolder)'
+      inputs:
+        deploymentScope: 'Resource Group'
+        azureResourceManagerConnection: '$(AZURECONNECTIONNAME)'
+        subscriptionId: '$(ARM_SUBSCRIPTION_ID)'
+        action: 'DeleteRG'
+        resourceGroupName: '$(libraryfolder)'
\ No newline at end of file
diff --git a/deploy/pipelines/02-sap-workload-zone.yaml b/deploy/pipelines/02-sap-workload-zone.yaml
new file mode 100644
index 0000000000..dcc41b74c1
--- /dev/null
+++ b/deploy/pipelines/02-sap-workload-zone.yaml
@@ -0,0 +1,100 @@
+# Starter pipeline
+# Start with a minimal pipeline that you can customize to build and deploy your code.
+# Add steps that build, run tests, deploy, and more:
+# https://aka.ms/yaml
+
+parameters:
+
+- name: workloadzone
+  displayName: ENV-LOCA-VNET-INFRASTRUCTURE
+  type: string
+  default: DEV-WEEU-SAP01-INFRASTRUCTURE
+
+- name: environment
+  displayName: Deployer Environment (MGMT, DEV, QUA, PRD, ...)
+  type: string
+  default: MGMT
+
+- name: cleanup
+  displayName: Remove the relevant Resource Groups instead of deploying
+  type: boolean
+  default: False
+
+trigger:
+  none
+
+pool:
+#  name: MIMERGEL-Selfhosted
+  vmImage: ubuntu-latest
+
+variables:
+  zonefolder: ${{ parameters.workloadzone }}
+  zoneconfig: ${{ parameters.workloadzone }}.tfvars
+  env: ${{ parameters.environment }}
+  log: logfile_$(Build.BuildId)
+
+name: $(zonefolder)_Cleanup_${{ parameters.cleanup }}_$(SourceBranchName)_$(Date:yyyyMMdd)$(Rev:.r)
+
+stages:
+- stage: Deploy_SAP_Workloadzone
+  condition: eq(${{ parameters.cleanup }}, false)
+  jobs:
+  - job: Deploy_SAP_Workloadzone
+    steps:
+    - script: |
+        #!/bin/bash
+        green="\e[1;32m"
+        reset="\e[0m"
+        echo -e "$green--- Install Terraform ---$reset"
+          wget -q https://releases.hashicorp.com/terraform/1.0.8/terraform_1.0.8_linux_amd64.zip
+          unzip -qq terraform_1.0.8_linux_amd64.zip
+          sudo mv terraform /bin/ ; rm terraform_1.0.8_linux_amd64.zip
+        echo -e "$green--- Clone the $(Branch) branch of repository $(Repository) ---$reset"
+          git clone --quiet --single-branch --branch $(Branch) $(Repository)
+        echo -e "$green--- Set DEPLOYMENT_REPO_PATH variable and ---$reset"
+        echo -e "$green--- Update .sap_deployment_automation/config as DEPLOYMENT_REPO_PATH can change on devops agent ---$reset"
+          export DEPLOYMENT_REPO_PATH=$(Build.Repository.LocalPath)/sap-automation
+          echo DEPLOYMENT_REPO_PATH=$DEPLOYMENT_REPO_PATH > .sap_deployment_automation/config
+        echo -e "$green--- Set local build repo path as new home ---$reset"
+          export HOME=$(Build.Repository.LocalPath)
+        echo -e "$green--- az login ---$reset"
+          az login --service-principal --username $(ARM_CLIENT_ID) --password $(ARM_CLIENT_SECRET) --tenant $(ARM_TENANT_ID)
+          az account set --subscription $(ARM_SUBSCRIPTION_ID)
+        echo -e "$green--- --- Convert config file to UX format ---$reset"
+          sudo apt-get -qq install dos2unix
+          dos2unix -q LANDSCAPE/$(zonefolder)/$(zoneconfig)
+        echo -e "$green--- Prepare the exchange of information from devops agent back to the repository ---$reset"
+          organization=$(echo $(System.CollectionUri) | cut -d'/' -f4)
+          git config  http.https://$organization@dev.azure.com/$organization/$(System.TeamProject)/_git/$(Build.Repository.Name).extraheader "AUTHORIZATION: bearer $SYSTEM_ACCESSTOKEN"
+        echo -e "$green--- Run the prepare region script that deploys the subscription hub with the Deployer VM and SAP Library ---$reset"
+          cd LANDSCAPE/$(zonefolder)
+          $DEPLOYMENT_REPO_PATH/deploy/scripts/install_workloadzone.sh --parameterfile $(zoneconfig) --deployer_environment $(env) --subscription $(ARM_SUBSCRIPTION_ID) --spn_id $(ARM_CLIENT_ID) --spn_secret $(ARM_CLIENT_SECRET) --tenant_id $(ARM_TENANT_ID) --auto-approve 
+          cd $HOME
+        echo -e "$green--- Add & update files in the DevOps Repository ---$reset"
+          git config --global user.email "$(Build.RequestedForEmail)"
+          git config --global user.name "$(Build.RequestedFor)" 
+          git add .sap_deployment_automation           &>> /tmp/$(log)2
+          git add LANDSCAPE/$(zonefolder)/.terraform   &>> /tmp/$(log)2
+          git commit -m "Added updates from devops deployment $(Build.DefinitionName) [skip ci]" &>> /tmp/$(log)2
+          git push -f origin HEAD:main                 &>> /tmp/$(log)2
+        echo "output the log ---$reset"
+          cat /tmp/$(log)2
+        git config --unset-all http.https://$organization@dev.azure.com/$organization/$(System.TeamProject)/_git/$(Build.Repository.Name).extraheader
+      displayName: Deploy_SAP_Workloadzone
+      env:
+          SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+      failOnStderr: true
+
+- stage: Cleanup_Workload_Zone
+  condition: eq(${{ parameters.cleanup }}, true)
+  jobs:
+  - job: Remove_Workload_Zone
+    steps:
+    - task: AzureResourceManagerTemplateDeployment@3
+      displayName: 'Remove Resource Group $(zonefolder)'
+      inputs:
+        deploymentScope: 'Resource Group'
+        azureResourceManagerConnection: '$(AZURECONNECTIONNAME)'
+        subscriptionId: '$(ARM_SUBSCRIPTION_ID)'
+        action: 'DeleteRG'
+        resourceGroupName: '$(zonefolder)'
\ No newline at end of file
diff --git a/deploy/pipelines/03-sap-system-deployment.yaml b/deploy/pipelines/03-sap-system-deployment.yaml
new file mode 100644
index 0000000000..4a2f2c5408
--- /dev/null
+++ b/deploy/pipelines/03-sap-system-deployment.yaml
@@ -0,0 +1,101 @@
+# Starter pipeline
+# Start with a minimal pipeline that you can customize to build and deploy your code.
+# Add steps that build, run tests, deploy, and more:
+# https://aka.ms/yaml
+
+parameters:
+
+- name: sap_system
+  displayName: ENV-LOCA-VNET-SID
+  type: string
+  default: DEV-WEEU-SAP01-X01
+
+- name: cleanup
+  displayName: Remove the relevant Resource Groups instead of deploying
+  type: boolean
+  default: False
+
+trigger:
+  none
+
+pool:
+#  name: MIMERGEL-Selfhosted
+  vmImage: ubuntu-latest
+
+variables:
+  sapsystemfolder: ${{ parameters.sap_system }}
+  sapsystemconfig: ${{ parameters.sap_system }}.tfvars
+  log: logfile_$(Build.BuildId)
+
+name: $(sapsystemfolder)_Cleanup_${{ parameters.cleanup }}_$(SourceBranchName)_$(Date:yyyyMMdd)$(Rev:.r)
+
+stages:
+- stage: Deploy_SAP_Infrastructure
+  condition: eq(${{ parameters.cleanup }}, false)
+  jobs:
+  - job: Deploy_SAP_Infrastructure
+    steps:
+    - script: |
+        #!/bin/bash
+        green="\e[1;32m"
+        reset="\e[0m"
+        SID=$(echo $(sapsystemfolder) | cut -d'-' -f4 | xargs) 
+        echo -e "$green--- Install Terraform ---$reset"
+          wget -q https://releases.hashicorp.com/terraform/1.0.9/terraform_1.0.9_linux_amd64.zip
+          unzip -qq terraform_1.0.9_linux_amd64.zip
+          sudo mv terraform /bin/ ; rm terraform_1.0.9_linux_amd64.zip
+        echo -e "$green--- Clone the $(Branch) branch of repository $(Repository) ---$reset"
+          git clone --quiet --single-branch --branch $(Branch) $(Repository)
+        echo -e "$green--- Set DEPLOYMENT_REPO_PATH variable and ---$reset"
+        echo -e "$green--- Update .sap_deployment_automation/config as DEPLOYMENT_REPO_PATH can change on devops agent ---$reset"
+          export DEPLOYMENT_REPO_PATH=$(Build.Repository.LocalPath)/sap-automation
+          echo DEPLOYMENT_REPO_PATH=$DEPLOYMENT_REPO_PATH > .sap_deployment_automation/config
+        echo -e "$green--- Set local build repo path as new home ---$reset"
+          export HOME=$(Build.Repository.LocalPath)
+        echo -e "$green--- az login ---$reset"
+          az login --service-principal --username $(ARM_CLIENT_ID) --password $(ARM_CLIENT_SECRET) --tenant $(ARM_TENANT_ID)
+          az account set --subscription $(ARM_SUBSCRIPTION_ID)
+          export ARM_SUBSCRIPTION_ID=$(ARM_SUBSCRIPTION_ID)
+          export ARM_CLIENT_ID=$(ARM_CLIENT_ID)
+          export ARM_CLIENT_SECRET=$(ARM_CLIENT_SECRET)
+          export ARM_TENANT_ID=$(ARM_TENANT_ID)
+        echo -e "$green--- --- Convert config file to UX format ---$reset"
+          sudo apt-get -qq install dos2unix
+          dos2unix -q SYSTEM/$(sapsystemfolder)/$(sapsystemconfig)
+        echo -e "$green--- Prepare the exchange of information from devops agent back to the repository ---$reset"
+          organization=$(echo $(System.CollectionUri) | cut -d'/' -f4)
+          git config  http.https://$organization@dev.azure.com/$organization/$(System.TeamProject)/_git/$(Build.Repository.Name).extraheader "AUTHORIZATION: bearer $SYSTEM_ACCESSTOKEN"
+        echo -e "$green--- Run the installer script that deploys the SAP System ---$reset"
+          cd SYSTEM/$(sapsystemfolder)
+          ${DEPLOYMENT_REPO_PATH}/deploy/scripts/installer.sh --parameterfile $(sapsystemconfig) --type sap_system --ado --auto-approve
+          cd $HOME
+        echo -e "$green--- Add & update files in the DevOps Repository ---$reset"
+          git config --global user.email "$(Build.RequestedForEmail)"
+          git config --global user.name "$(Build.RequestedFor)" 
+          git add .sap_deployment_automation    &>> /tmp/$(log)2
+          git add SYSTEM/$(sapsystemfolder)/.terraform/terraform.tfstate   &>> /tmp/$(log)2
+          git add SYSTEM/$(sapsystemfolder)/sap-parameters.yaml            &>> /tmp/$(log)2
+          git add SYSTEM/$(sapsystemfolder)/${SID}_hosts.yaml              &>> /tmp/$(log)2
+          git commit -m "Added updates from devops deployment $(Build.DefinitionName) [skip ci]" &>> /tmp/$(log)2
+          git push -f origin HEAD:main             &>> /tmp/$(log)2
+        echo "output the log ---$reset"
+          cat /tmp/$(log)2
+        git config --unset-all http.https://$organization@dev.azure.com/$organization/$(System.TeamProject)/_git/$(Build.Repository.Name).extraheader
+      displayName: Deploy_SAP_Infrastructure
+      env:
+        SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+      failOnStderr: true
+
+- stage: Cleanup
+  condition: eq(${{ parameters.cleanup }}, true)
+  jobs:
+  - job: Remove_Deployer
+    steps:
+    - task: AzureResourceManagerTemplateDeployment@3
+      displayName: 'Remove Resource Group $(sapsystemfolder)'
+      inputs:
+        deploymentScope: 'Resource Group'
+        azureResourceManagerConnection: '$(AZURECONNECTIONNAME)'
+        subscriptionId: '$(ARM_SUBSCRIPTION_ID)'
+        action: 'DeleteRG'
+        resourceGroupName: '$(sapsystemfolder)'
\ No newline at end of file
diff --git a/deploy/pipelines/04-sap-binary-processing.yaml b/deploy/pipelines/04-sap-binary-processing.yaml
new file mode 100644
index 0000000000..7cca84af8f
--- /dev/null
+++ b/deploy/pipelines/04-sap-binary-processing.yaml
@@ -0,0 +1,94 @@
+# Starter pipeline
+# Start with a minimal pipeline that you can customize to build and deploy your code.
+# Add steps that build, run tests, deploy, and more:
+# https://aka.ms/yaml
+
+parameters:
+
+- name: bom_base_name
+  displayName: BOM Base Name
+  type: string
+  default: S41909SPS03_v0006ms
+
+- name: environment
+  displayName: Deployer Environment
+  type: string
+  default: MGMT
+
+- name: region
+  displayName: SAP Binary Storage Account Location
+  type: string
+  default: germanywestcentral
+
+trigger:
+  none
+
+# This pipeline must run on a self hosted devops agent running as the download from SAP is around 80GB and a large temp drive is required (e.g. on D4ds_v4)
+pool:
+  name: $(agent)
+#  vmImage: ubuntu-latest
+
+variables:
+  bom: ${{ parameters.bom_base_name }}
+  env: ${{ parameters.environment }}
+  loc: ${{ parameters.region }}
+
+name: $(bom)_$(env)_$(loc)_$(SourceBranchName)_$(Date:yyyyMMdd)$(Rev:.r)
+
+stages:
+- stage: Prepare_Download_Configuration
+  jobs:
+  - job: Prepare_Download_Configuration
+    steps:
+    - script: |
+        #!/bin/bash
+        green="\e[1;32m"
+        reset="\e[0m"
+        echo -e "$green--- Clone the $(Branch) branch of repository $(Repository) ---$reset"
+          git clone --quiet --single-branch --branch $(Branch) $(Repository)
+        echo -e "$green--- Update .sap_deployment_automation/config as DEPLOYMENT_REPO_PATH can change on devops agent ---$reset"
+          export DEPLOYMENT_REPO_PATH=$(Build.Repository.LocalPath)/sap-hana
+          mkdir -p .sap_deployment_automation
+          echo DEPLOYMENT_REPO_PATH=$DEPLOYMENT_REPO_PATH > .sap_deployment_automation/config
+          export HOME=$(Build.Repository.LocalPath)
+          az login --service-principal --username $(ARM_CLIENT_ID) --password $(ARM_CLIENT_SECRET) --tenant $(ARM_TENANT_ID)
+          az account set --subscription $(ARM_SUBSCRIPTION_ID)
+        echo -e "$green--- Convert config files to UX format ---$reset"
+          sudo apt-get -qq install dos2unix
+          dos2unix -q BOMS/sap-parameters.yaml
+          kv_name=$(cat .sap_deployment_automation/$(env)$(loc) | grep keyvault |awk -F'=' '{print $2}')
+          sapbits_sa_url=$(az keyvault secret show --vault-name $kv_name --name sapbits-location-base-path --query value |xargs)
+          sed -i 's|bom_base_name:.*|bom_base_name:   '"$(bom)"'|' BOMS/sap-parameters.yaml
+          sed -i 's|sapbits_location_base_path:.*|sapbits_location_base_path:    '"$sapbits_sa_url"'|' BOMS/sap-parameters.yaml
+          sed -i 's|kv_name:.*|kv_name:    '"$kv_name"'|' BOMS/sap-parameters.yaml
+        echo -e "$green--- Content of BOMS/sap-parameters.yaml ---$reset"
+          cat BOMS/sap-parameters.yaml
+        echo -e "$green--- Set S-Username and S-Password in the key_vault if not yet there ---$reset"
+          export SUsername=$(az keyvault secret list --vault-name $kv_name --query [].name -o tsv | grep S-Username | xargs)
+          echo $SUsername
+          if [ -z "$SUsername" ]; then 
+            az keyvault secret set --name S-Username --vault-name $kv_name --value $(S-Username)
+          fi
+          export SPassword=$(az keyvault secret list --vault-name $kv_name --query [].name -o tsv | grep S-Password | xargs)
+          if [ -z "$SPassword" ]; then 
+            az keyvault secret set --name S-Password --vault-name $kv_name --value $(S-Password)
+          fi
+      displayName: Prepare_Download_Configuration
+      env:
+          SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+      failOnStderr: true
+
+- stage: Process_Binaries
+  jobs:
+  - job: Process_Binaries
+    timeoutInMinutes: 0
+    steps:
+    - checkout: none
+    - task: Ansible@0
+      displayName: Process_Binaries
+      timeoutInMinutes: 0
+      inputs:
+        ansibleInterface: 'agentMachine'
+        playbookPathOnAgentMachine: 'sap-automation/deploy/ansible/playbook_03_bom_processing.yaml'
+        args: ' -e "HOME=$(Build.Repository.LocalPath)" -e "@BOMS/sap-parameters.yaml" -e "_workspace_directory=$(Build.Repository.LocalPath)/BOMS/" -e "bom_processing=true" '
+        failOnStderr: false
diff --git a/deploy/pipelines/05-DB-and-SAP-install.yaml b/deploy/pipelines/05-DB-and-SAP-install.yaml
new file mode 100644
index 0000000000..3818701044
--- /dev/null
+++ b/deploy/pipelines/05-DB-and-SAP-install.yaml
@@ -0,0 +1,359 @@
+# Starter pipeline
+# Start with a minimal pipeline that you can customize to build and deploy your code.
+# Add steps that build, run tests, deploy, and more:
+# https://aka.ms/yaml
+
+parameters:
+
+- name: sap_system
+  displayName: ENV-LOCA-VNET-SID
+  type: string
+  default: DEV-GEWC-SAP01-E01
+
+- name: bom_base_name
+  displayName: BOM Base Name
+  type: string
+  default: S41909SPS03_v0006ms
+
+- name: sap_fqdn
+  displayName: SAP Domain Name
+  type: string
+  default: sap.contoso.net
+
+- name: baseosconfig
+  displayName: Base OS Config
+  type: boolean
+  default: true
+
+- name: saposconfig
+  displayName: SAP specific OS Config
+  type: boolean
+  default: true
+
+- name: bomprocessing
+  displayName: BOM Processing
+  type: boolean
+  default: true
+
+- name: hanadbinstall
+  displayName: HANA DB Install 
+  type: boolean
+  default: true
+
+- name: scsinstall
+  displayName: SCS Install
+  type: boolean
+  default: true
+
+- name: dbload
+  displayName: DB Load
+  type: boolean
+  default: true
+
+- name: pasinstall
+  displayName: PAS Install
+  type: boolean
+  default: true
+
+- name: appinstall
+  displayName: APP Install
+  type: boolean
+  default: true
+
+- name: webdispinstall
+  displayName: WebDisp Install
+  type: boolean
+  default: false
+
+- name: highavailability
+  displayName: SAP & DB High Availability
+  type: boolean
+  default: false
+
+trigger:
+  none
+
+pool:
+  name: $(agent)
+
+variables:
+  sapsystemfolder: ${{ parameters.sap_system }}
+  sapsystemconfig: ${{ parameters.sap_system }}.tfvars
+  bom: ${{ parameters.bom_base_name }}
+  fqdn: ${{ parameters.sap_fqdn }}
+  log: logfile_$(Build.BuildId)
+
+name: $(sapsystemfolder)_$(bom)_$(fqdn)_$(SourceBranchName)_$(Date:yyyyMMdd)$(Rev:.r)
+
+stages:
+- stage: Prepare_DB_SAP_Installation
+  jobs:
+  - job: Prepare_DB_SAP_Installation
+    steps:
+    - script: |
+        #!/bin/bash
+        green="\e[1;32m"
+        reset="\e[0m"
+        echo -e "$green--- Clone the $(Branch) branch of repository $(Repository) ---$reset"
+          git clone --quiet --single-branch --branch $(Branch) $(Repository)
+        echo -e "$green--- Set DEPLOYMENT_REPO_PATH variable and                                                       ---$reset"
+        echo -e "$green--- Update .sap_deployment_automation/config as DEPLOYMENT_REPO_PATH can change on devops agent ---$reset"
+          export DEPLOYMENT_REPO_PATH=$(Build.Repository.LocalPath)/sap-hana
+          echo DEPLOYMENT_REPO_PATH=$DEPLOYMENT_REPO_PATH > .sap_deployment_automation/config
+        echo -e "$green--- Set local build repo path as new home ---$reset"
+          export HOME=$(Build.Repository.LocalPath)
+        echo -e "$green--- --- Convert config file to UX format ---$reset"
+          sudo apt-get -qq install dos2unix
+          dos2unix -q SYSTEM/$(sapsystemfolder)/sap-parameters.yaml
+          dos2unix -q SYSTEM/$(sapsystemfolder)/$(sapsystemconfig)
+        echo -e "$green--- Add BOM Base Name and SAP FQDN to sap-parameters.yaml ---$reset"
+          sed -i 's|bom_base_name:.*|bom_base_name:                 '"$(bom)"'|'  SYSTEM/$(sapsystemfolder)/sap-parameters.yaml
+          sed -i 's|sap_fqdn:.*|sap_fqdn:                      '"$(fqdn)"'|'      SYSTEM/$(sapsystemfolder)/sap-parameters.yaml
+        echo -e "$green--- Get SID and copy hosts file over for ansible runs ---$reset"
+          export SID=$(cat SYSTEM/$(sapsystemfolder)/$(sapsystemconfig) | grep sid'=' | awk -F'=' '{print $2}' | xargs) ; echo SID $SID
+          cp -p SYSTEM/$(sapsystemfolder)/${SID}_hosts.yaml ./sap_hosts.yaml
+        echo -e "$green--- Prepare the exchange of information from devops agent back to the repository ---$reset"
+          organization=$(echo $(System.CollectionUri) | cut -d'/' -f4)
+          git config  http.https://$organization@dev.azure.com/$organization/$(System.TeamProject)/_git/$(Build.Repository.Name).extraheader "AUTHORIZATION: bearer $SYSTEM_ACCESSTOKEN"
+        echo -e "$green--- az login ---$reset"
+          az login --service-principal --username $(ARM_CLIENT_ID) --password $(ARM_CLIENT_SECRET) --tenant $(ARM_TENANT_ID)
+          az account set --subscription $(ARM_SUBSCRIPTION_ID)
+        echo -e "$green--- Get sshkey to connect to SAP VMs ---$reset"
+          export ENV=$(echo $(sapsystemfolder) | awk -F'-' '{print $1}' | xargs) ; echo Environment $ENV
+          export LOCA=$(echo $(sapsystemfolder) | awk -F'-' '{print $2}' | xargs) ; echo Environment $LOCA
+          export location=$(cat SYSTEM/$(sapsystemfolder)/$(sapsystemconfig) | grep location'=' | awk -F'=' '{print $2}' | xargs) ; echo Location $location
+          export kv_name=$(cat .sap_deployment_automation/$ENV$location      | grep workloadkeyvault | awk -F'=' '{print $2}' | xargs) ; echo SAP_Keyvault $kv_name
+          az keyvault secret show --name ${ENV}-${LOCA}-SAP-sid-sshkey --vault-name $kv_name --query value -o tsv > sshkey
+          chmod 600 sshkey
+        echo -e "$green--- Add & update files in the DevOps Repository ---$reset"
+          git config --global user.email "$(Build.RequestedForEmail)"
+          git config --global user.name "$(Build.RequestedFor)" 
+          git add .sap_deployment_automation                      &>> /tmp/$(log)
+          git add SYSTEM/$(sapsystemfolder)/sap-parameters.yaml   &>> /tmp/$(log)
+          git commit -m "Added updates from devops deployment $(Build.DefinitionName) [skip ci]" &>> /tmp/$(log)
+          git push -f origin HEAD:main                            &>> /tmp/$(log)
+        echo "output the log ---$reset"
+          cat /tmp/$(log)
+        git config --unset-all http.https://$organization@dev.azure.com/$organization/$(System.TeamProject)/_git/$(Build.Repository.Name).extraheader
+      displayName: Prepare_DB_SAP_Installation
+      env:
+        SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+      failOnStderr: true
+
+- stage: Base_OS_Config
+  condition: eq(${{ parameters.baseosconfig }}, true)
+  dependsOn:
+    - Prepare_DB_SAP_Installation
+  jobs:
+  - job: Base_OS_Config
+    steps:
+    - checkout: none
+    - task: Ansible@0
+      displayName: Base_OS_Config
+      inputs:
+        ansibleInterface: 'agentMachine'
+        playbookPathOnAgentMachine: 'sap-automation/deploy/ansible/playbook_01_os_base_config.yaml'
+        inventoriesAgentMachine: 'file'
+        inventoryFileOnAgentMachine: 'sap_hosts.yaml'
+        args: '--private-key sshkey -e "@SYSTEM/$(sapsystemfolder)/sap-parameters.yaml" -e "_workspace_directory=$(Build.Repository.LocalPath)/SYSTEM/$(sapsystemfolder)/"'
+        failOnStderr: false
+
+- stage: SAP_OS_Config
+  condition: eq(${{ parameters.saposconfig }}, true)
+  dependsOn:
+    - Prepare_DB_SAP_Installation
+    - Base_OS_Config
+  jobs:
+  - job: SAP_OS_Config
+    steps:
+    - checkout: none
+    - task: Ansible@0
+      displayName: SAP_OS_Config
+      inputs:
+        ansibleInterface: 'agentMachine'
+        playbookPathOnAgentMachine: 'sap-automation/deploy/ansible/playbook_02_os_sap_specific_config.yaml'
+        inventoriesAgentMachine: 'file'
+        inventoryFileOnAgentMachine: 'sap_hosts.yaml'
+        args: '--private-key sshkey -e "@SYSTEM/$(sapsystemfolder)/sap-parameters.yaml" -e "_workspace_directory=$(Build.Repository.LocalPath)/SYSTEM/$(sapsystemfolder)/"'
+        failOnStderr: false
+
+- stage: BOM_Processing
+  condition: eq(${{ parameters.bomprocessing }}, true)
+  dependsOn:
+  - Prepare_DB_SAP_Installation
+  - Base_OS_Config
+  - SAP_OS_Config
+  jobs:
+  - job: BOM_Processing
+    steps:
+    - checkout: none
+    - task: Ansible@0
+      displayName: BOM_Processing
+      inputs:
+        ansibleInterface: 'agentMachine'
+        playbookPathOnAgentMachine: 'sap-automation/deploy/ansible/playbook_03_bom_processing.yaml'
+        inventoriesAgentMachine: 'file'
+        inventoryFileOnAgentMachine: 'sap_hosts.yaml'
+        args: '--private-key sshkey -e "@SYSTEM/$(sapsystemfolder)/sap-parameters.yaml" -e "_workspace_directory=$(Build.Repository.LocalPath)/SYSTEM/$(sapsystemfolder)/"'
+        failOnStderr: false
+
+
+- stage: HANA_DB_Install
+  condition: eq(${{ parameters.hanadbinstall }}, true)
+  dependsOn:
+  - Prepare_DB_SAP_Installation
+  - SAP_OS_Config
+  - BOM_Processing
+  jobs:
+  - job: HANA_DB_Install
+    steps:
+    - checkout: none
+    - task: Ansible@0
+      displayName: HANA_DB_Install
+      inputs:
+        ansibleInterface: 'agentMachine'
+        playbookPathOnAgentMachine: 'sap-automation/deploy/ansible/playbook_04_00_00_hana_db_install.yaml'
+        inventoriesAgentMachine: 'file'
+        inventoryFileOnAgentMachine: 'sap_hosts.yaml'
+        args: '--private-key sshkey -e "@SYSTEM/$(sapsystemfolder)/sap-parameters.yaml" -e "_workspace_directory=$(Build.Repository.LocalPath)/SYSTEM/$(sapsystemfolder)/"'
+        failOnStderr: false
+
+- stage: SCS_Install
+  condition: eq(${{ parameters.scsinstall }}, true)
+  dependsOn:
+  - Prepare_DB_SAP_Installation
+  - SAP_OS_Config
+  - BOM_Processing
+  - HANA_DB_Install
+  jobs:
+  - job: SCS_Install
+    steps:
+    - checkout: none
+    - task: Ansible@0
+      displayName: SCS_Install
+      inputs:
+        ansibleInterface: 'agentMachine'
+        playbookPathOnAgentMachine: 'sap-automation/deploy/ansible/playbook_05_00_00_sap_scs_install.yaml'
+        inventoriesAgentMachine: 'file'
+        inventoryFileOnAgentMachine: 'sap_hosts.yaml'
+        args: '--private-key sshkey -e "@SYSTEM/$(sapsystemfolder)/sap-parameters.yaml" -e "_workspace_directory=$(Build.Repository.LocalPath)/SYSTEM/$(sapsystemfolder)/"'
+        failOnStderr: false
+
+- stage: DB_Load
+  condition: eq(${{ parameters.dbload }}, true)
+  dependsOn:
+  - Prepare_DB_SAP_Installation
+  - SAP_OS_Config
+  - BOM_Processing
+  - HANA_DB_Install
+  - SCS_Install
+  jobs:
+  - job: DB_Load
+    steps:
+    - checkout: none
+    - task: Ansible@0
+      displayName: DB_Load
+      inputs:
+        ansibleInterface: 'agentMachine'
+        playbookPathOnAgentMachine: 'sap-automation/deploy/ansible/playbook_05_01_sap_dbload.yaml'
+        inventoriesAgentMachine: 'file'
+        inventoryFileOnAgentMachine: 'sap_hosts.yaml'
+        args: '--private-key sshkey -e "@SYSTEM/$(sapsystemfolder)/sap-parameters.yaml" -e "_workspace_directory=$(Build.Repository.LocalPath)/SYSTEM/$(sapsystemfolder)/"'
+        failOnStderr: false
+
+- stage: PAS_Install
+  condition: eq(${{ parameters.pasinstall }}, true)
+  dependsOn:
+  - Prepare_DB_SAP_Installation
+  - SAP_OS_Config
+  - BOM_Processing
+  - HANA_DB_Install
+  - SCS_Install
+  - DB_Load
+  jobs:
+  - job: PAS_Install
+    steps:
+    - checkout: none
+    - task: Ansible@0
+      displayName: PAS_Install
+      inputs:
+        ansibleInterface: 'agentMachine'
+        playbookPathOnAgentMachine: 'sap-automation/deploy/ansible/playbook_05_02_sap_pas_install.yaml'
+        inventoriesAgentMachine: 'file'
+        inventoryFileOnAgentMachine: 'sap_hosts.yaml'
+        args: '--private-key sshkey -e "@SYSTEM/$(sapsystemfolder)/sap-parameters.yaml" -e "_workspace_directory=$(Build.Repository.LocalPath)/SYSTEM/$(sapsystemfolder)/"'
+        failOnStderr: false
+
+- stage: APP_Install
+  condition: eq(${{ parameters.appinstall }}, true)
+  dependsOn:
+  - Prepare_DB_SAP_Installation
+  - SAP_OS_Config
+  - BOM_Processing
+  - HANA_DB_Install
+  - SCS_Install
+  - DB_Load
+  - PAS_Install
+  jobs:
+  - job: APP_Install
+    steps:
+    - checkout: none
+    - task: Ansible@0
+      displayName: APP_Install
+      inputs:
+        ansibleInterface: 'agentMachine'
+        playbookPathOnAgentMachine: 'sap-automation/deploy/ansible/playbook_05_03_sap_app_install.yaml'
+        inventoriesAgentMachine: 'file'
+        inventoryFileOnAgentMachine: 'sap_hosts.yaml'
+        args: '--private-key sshkey -e "@SYSTEM/$(sapsystemfolder)/sap-parameters.yaml" -e "_workspace_directory=$(Build.Repository.LocalPath)/SYSTEM/$(sapsystemfolder)/"'
+        failOnStderr: false
+
+- stage: WebDisp_Install
+  condition: eq(${{ parameters.webdispinstall }}, true)
+  dependsOn:
+  - Prepare_DB_SAP_Installation
+  - SAP_OS_Config
+  - BOM_Processing
+  - HANA_DB_Install
+  - SCS_Install
+  - DB_Load
+  - PAS_Install
+  - APP_Install
+  jobs:
+  - job: WebDisp_Install
+    steps:
+    - checkout: none
+    - task: Ansible@0
+      displayName: WebDisp_Install
+      inputs:
+        ansibleInterface: 'agentMachine'
+        playbookPathOnAgentMachine: 'sap-automation/deploy/ansible/playbook_05_04_sap_web_install.yaml'
+        inventoriesAgentMachine: 'file'
+        inventoryFileOnAgentMachine: 'sap_hosts.yaml'
+        args: '--private-key sshkey -e "@SYSTEM/$(sapsystemfolder)/sap-parameters.yaml" -e "_workspace_directory=$(Build.Repository.LocalPath)/SYSTEM/$(sapsystemfolder)/"'
+        failOnStderr: false
+
+- stage: HA_Setup
+  condition: eq(${{ parameters.webdispinstall }}, true)
+  dependsOn:
+  - Prepare_DB_SAP_Installation
+  - SAP_OS_Config
+  - BOM_Processing
+  - HANA_DB_Install
+  - SCS_Install
+  - DB_Load
+  - PAS_Install
+  - APP_Install
+  jobs:
+  - job: HA_Setup
+    steps:
+    - checkout: none
+    - task: Ansible@0
+      displayName: HA_Setup
+      inputs:
+        ansibleInterface: 'agentMachine'
+        playbookPathOnAgentMachine: 'sap-automation/deploy/ansible/playbook_06_00_00_pacemaker.yaml'
+        inventoriesAgentMachine: 'file'
+        inventoryFileOnAgentMachine: 'sap_hosts.yaml'
+        args: '--private-key sshkey -e "@SYSTEM/$(sapsystemfolder)/sap-parameters.yaml" -e "_workspace_directory=$(Build.Repository.LocalPath)/SYSTEM/$(sapsystemfolder)/"'
+        failOnStderr: false
\ No newline at end of file

From 74661fff50017287aab93d3c6b31684adde233de Mon Sep 17 00:00:00 2001
From: Michael Mergell <mimergel@microsoft.com>
Date: Thu, 25 Nov 2021 08:10:58 +0000
Subject: [PATCH 02/19] Update deploy/pipelines/03-sap-system-deployment.yaml

Co-authored-by: Kimmo Forss <kimmo.forss@microsoft.com>
---
 deploy/pipelines/03-sap-system-deployment.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/pipelines/03-sap-system-deployment.yaml b/deploy/pipelines/03-sap-system-deployment.yaml
index 4a2f2c5408..caf86af4d3 100644
--- a/deploy/pipelines/03-sap-system-deployment.yaml
+++ b/deploy/pipelines/03-sap-system-deployment.yaml
@@ -41,7 +41,7 @@ stages:
         reset="\e[0m"
         SID=$(echo $(sapsystemfolder) | cut -d'-' -f4 | xargs) 
         echo -e "$green--- Install Terraform ---$reset"
-          wget -q https://releases.hashicorp.com/terraform/1.0.9/terraform_1.0.9_linux_amd64.zip
+          wget -q https://releases.hashicorp.com/terraform/1.0.8/terraform_1.0.8_linux_amd64.zip
           unzip -qq terraform_1.0.9_linux_amd64.zip
           sudo mv terraform /bin/ ; rm terraform_1.0.9_linux_amd64.zip
         echo -e "$green--- Clone the $(Branch) branch of repository $(Repository) ---$reset"

From b5b590ba30e1a578d21e99aa302a55d628cab469 Mon Sep 17 00:00:00 2001
From: Michael Mergell <mimergel@microsoft.com>
Date: Thu, 25 Nov 2021 08:12:06 +0000
Subject: [PATCH 03/19] Update deploy/pipelines/03-sap-system-deployment.yaml

Co-authored-by: Kimmo Forss <kimmo.forss@microsoft.com>
---
 deploy/pipelines/03-sap-system-deployment.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/pipelines/03-sap-system-deployment.yaml b/deploy/pipelines/03-sap-system-deployment.yaml
index caf86af4d3..a8d20df128 100644
--- a/deploy/pipelines/03-sap-system-deployment.yaml
+++ b/deploy/pipelines/03-sap-system-deployment.yaml
@@ -43,7 +43,7 @@ stages:
         echo -e "$green--- Install Terraform ---$reset"
           wget -q https://releases.hashicorp.com/terraform/1.0.8/terraform_1.0.8_linux_amd64.zip
           unzip -qq terraform_1.0.9_linux_amd64.zip
-          sudo mv terraform /bin/ ; rm terraform_1.0.9_linux_amd64.zip
+          sudo mv terraform /bin/ ; rm terraform_1.0.8_linux_amd64.zip
         echo -e "$green--- Clone the $(Branch) branch of repository $(Repository) ---$reset"
           git clone --quiet --single-branch --branch $(Branch) $(Repository)
         echo -e "$green--- Set DEPLOYMENT_REPO_PATH variable and ---$reset"

From b23e222a5bba08217c8dbb57017cf33c711df6a4 Mon Sep 17 00:00:00 2001
From: Michael Mergell <mimergel@microsoft.com>
Date: Thu, 25 Nov 2021 08:12:21 +0000
Subject: [PATCH 04/19] Update deploy/pipelines/05-DB-and-SAP-install.yaml

Co-authored-by: Kimmo Forss <kimmo.forss@microsoft.com>
---
 deploy/pipelines/05-DB-and-SAP-install.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/pipelines/05-DB-and-SAP-install.yaml b/deploy/pipelines/05-DB-and-SAP-install.yaml
index 3818701044..b21558bddc 100644
--- a/deploy/pipelines/05-DB-and-SAP-install.yaml
+++ b/deploy/pipelines/05-DB-and-SAP-install.yaml
@@ -267,7 +267,7 @@ stages:
   - Prepare_DB_SAP_Installation
   - SAP_OS_Config
   - BOM_Processing
-  - HANA_DB_Install
+  - DB_Install
   - SCS_Install
   - DB_Load
   jobs:

From 9effb161b50303824cf62bcaa6bd46fec13cce9d Mon Sep 17 00:00:00 2001
From: Michael Mergell <mimergel@microsoft.com>
Date: Thu, 25 Nov 2021 08:12:28 +0000
Subject: [PATCH 05/19] Update deploy/pipelines/05-DB-and-SAP-install.yaml

Co-authored-by: Kimmo Forss <kimmo.forss@microsoft.com>
---
 deploy/pipelines/05-DB-and-SAP-install.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/pipelines/05-DB-and-SAP-install.yaml b/deploy/pipelines/05-DB-and-SAP-install.yaml
index b21558bddc..1eee9bb5ff 100644
--- a/deploy/pipelines/05-DB-and-SAP-install.yaml
+++ b/deploy/pipelines/05-DB-and-SAP-install.yaml
@@ -290,7 +290,7 @@ stages:
   - Prepare_DB_SAP_Installation
   - SAP_OS_Config
   - BOM_Processing
-  - HANA_DB_Install
+  - DB_Install
   - SCS_Install
   - DB_Load
   - PAS_Install

From e6c94abdefd4beff8bf99f17fceb3124139fe092 Mon Sep 17 00:00:00 2001
From: Michael Mergell <mimergel@microsoft.com>
Date: Thu, 25 Nov 2021 08:12:33 +0000
Subject: [PATCH 06/19] Update deploy/pipelines/05-DB-and-SAP-install.yaml

Co-authored-by: Kimmo Forss <kimmo.forss@microsoft.com>
---
 deploy/pipelines/05-DB-and-SAP-install.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/pipelines/05-DB-and-SAP-install.yaml b/deploy/pipelines/05-DB-and-SAP-install.yaml
index 1eee9bb5ff..4976541465 100644
--- a/deploy/pipelines/05-DB-and-SAP-install.yaml
+++ b/deploy/pipelines/05-DB-and-SAP-install.yaml
@@ -314,7 +314,7 @@ stages:
   - Prepare_DB_SAP_Installation
   - SAP_OS_Config
   - BOM_Processing
-  - HANA_DB_Install
+  - DB_Install
   - SCS_Install
   - DB_Load
   - PAS_Install

From 20297a0435508e4b8f98702795d86993c295a4f4 Mon Sep 17 00:00:00 2001
From: Michael Mergell <mimergel@microsoft.com>
Date: Thu, 25 Nov 2021 08:12:38 +0000
Subject: [PATCH 07/19] Update deploy/pipelines/05-DB-and-SAP-install.yaml

Co-authored-by: Kimmo Forss <kimmo.forss@microsoft.com>
---
 deploy/pipelines/05-DB-and-SAP-install.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/pipelines/05-DB-and-SAP-install.yaml b/deploy/pipelines/05-DB-and-SAP-install.yaml
index 4976541465..7dd70fa6a3 100644
--- a/deploy/pipelines/05-DB-and-SAP-install.yaml
+++ b/deploy/pipelines/05-DB-and-SAP-install.yaml
@@ -339,7 +339,7 @@ stages:
   - Prepare_DB_SAP_Installation
   - SAP_OS_Config
   - BOM_Processing
-  - HANA_DB_Install
+  - DB_Install
   - SCS_Install
   - DB_Load
   - PAS_Install

From 8edf0d5e64ce8cff72bcad90c053cc4585d15188 Mon Sep 17 00:00:00 2001
From: Michael Mergell <mimergel@microsoft.com>
Date: Thu, 25 Nov 2021 08:12:43 +0000
Subject: [PATCH 08/19] Update deploy/pipelines/05-DB-and-SAP-install.yaml

Co-authored-by: Kimmo Forss <kimmo.forss@microsoft.com>
---
 deploy/pipelines/05-DB-and-SAP-install.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/pipelines/05-DB-and-SAP-install.yaml b/deploy/pipelines/05-DB-and-SAP-install.yaml
index 7dd70fa6a3..56452adfbd 100644
--- a/deploy/pipelines/05-DB-and-SAP-install.yaml
+++ b/deploy/pipelines/05-DB-and-SAP-install.yaml
@@ -352,7 +352,7 @@ stages:
       displayName: HA_Setup
       inputs:
         ansibleInterface: 'agentMachine'
-        playbookPathOnAgentMachine: 'sap-automation/deploy/ansible/playbook_06_00_00_pacemaker.yaml'
+        playbookPathOnAgentMachine: 'sap-automation/deploy/ansible/playbook_04_00_01_db_ha.yaml'
         inventoriesAgentMachine: 'file'
         inventoryFileOnAgentMachine: 'sap_hosts.yaml'
         args: '--private-key sshkey -e "@SYSTEM/$(sapsystemfolder)/sap-parameters.yaml" -e "_workspace_directory=$(Build.Repository.LocalPath)/SYSTEM/$(sapsystemfolder)/"'

From dc898987941ab4c053f8f55ce66904c311e5d35b Mon Sep 17 00:00:00 2001
From: Michael Mergell <mimergel@microsoft.com>
Date: Thu, 25 Nov 2021 08:14:04 +0000
Subject: [PATCH 09/19] Update deploy/pipelines/05-DB-and-SAP-install.yaml

Co-authored-by: Kimmo Forss <kimmo.forss@microsoft.com>
---
 deploy/pipelines/05-DB-and-SAP-install.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/pipelines/05-DB-and-SAP-install.yaml b/deploy/pipelines/05-DB-and-SAP-install.yaml
index 56452adfbd..664389a383 100644
--- a/deploy/pipelines/05-DB-and-SAP-install.yaml
+++ b/deploy/pipelines/05-DB-and-SAP-install.yaml
@@ -8,7 +8,7 @@ parameters:
 - name: sap_system
   displayName: ENV-LOCA-VNET-SID
   type: string
-  default: DEV-GEWC-SAP01-E01
+  default: DEV-NOEU-SAP01-X00
 
 - name: bom_base_name
   displayName: BOM Base Name

From 98e9bd98f3f893506ae497be8646c5d739ecf8ff Mon Sep 17 00:00:00 2001
From: Michael Mergell <mimergel@microsoft.com>
Date: Thu, 25 Nov 2021 08:18:41 +0000
Subject: [PATCH 10/19] Update deploy/pipelines/05-DB-and-SAP-install.yaml

Co-authored-by: Kimmo Forss <kimmo.forss@microsoft.com>
---
 deploy/pipelines/05-DB-and-SAP-install.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/pipelines/05-DB-and-SAP-install.yaml b/deploy/pipelines/05-DB-and-SAP-install.yaml
index 664389a383..6aac6a898c 100644
--- a/deploy/pipelines/05-DB-and-SAP-install.yaml
+++ b/deploy/pipelines/05-DB-and-SAP-install.yaml
@@ -21,7 +21,7 @@ parameters:
   default: sap.contoso.net
 
 - name: baseosconfig
-  displayName: Base OS Config
+  displayName: Base OS Configuration
   type: boolean
   default: true
 

From b69f43ab44832f7851536870a45c162ea25d50b5 Mon Sep 17 00:00:00 2001
From: Michael Mergell <mimergel@microsoft.com>
Date: Thu, 25 Nov 2021 08:18:59 +0000
Subject: [PATCH 11/19] Update deploy/pipelines/05-DB-and-SAP-install.yaml

Co-authored-by: Kimmo Forss <kimmo.forss@microsoft.com>
---
 deploy/pipelines/05-DB-and-SAP-install.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/pipelines/05-DB-and-SAP-install.yaml b/deploy/pipelines/05-DB-and-SAP-install.yaml
index 6aac6a898c..c789807396 100644
--- a/deploy/pipelines/05-DB-and-SAP-install.yaml
+++ b/deploy/pipelines/05-DB-and-SAP-install.yaml
@@ -26,7 +26,7 @@ parameters:
   default: true
 
 - name: saposconfig
-  displayName: SAP specific OS Config
+  displayName: SAP specific OS Configuration
   type: boolean
   default: true
 

From 83c1382f908374028105164855c4450b54edee7c Mon Sep 17 00:00:00 2001
From: Michael Mergell <mimergel@microsoft.com>
Date: Thu, 25 Nov 2021 08:19:17 +0000
Subject: [PATCH 12/19] Update deploy/pipelines/05-DB-and-SAP-install.yaml

Co-authored-by: Kimmo Forss <kimmo.forss@microsoft.com>
---
 deploy/pipelines/05-DB-and-SAP-install.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/pipelines/05-DB-and-SAP-install.yaml b/deploy/pipelines/05-DB-and-SAP-install.yaml
index c789807396..474cbb50e3 100644
--- a/deploy/pipelines/05-DB-and-SAP-install.yaml
+++ b/deploy/pipelines/05-DB-and-SAP-install.yaml
@@ -224,7 +224,7 @@ stages:
   - Prepare_DB_SAP_Installation
   - SAP_OS_Config
   - BOM_Processing
-  - HANA_DB_Install
+  - DB_Install
   jobs:
   - job: SCS_Install
     steps:

From 6a68b006a44e975ec03f6f649c4a5027311a916e Mon Sep 17 00:00:00 2001
From: Michael Mergell <mimergel@microsoft.com>
Date: Thu, 25 Nov 2021 08:19:41 +0000
Subject: [PATCH 13/19] Update deploy/pipelines/05-DB-and-SAP-install.yaml

Co-authored-by: Kimmo Forss <kimmo.forss@microsoft.com>
---
 deploy/pipelines/05-DB-and-SAP-install.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/pipelines/05-DB-and-SAP-install.yaml b/deploy/pipelines/05-DB-and-SAP-install.yaml
index 474cbb50e3..a9479d4601 100644
--- a/deploy/pipelines/05-DB-and-SAP-install.yaml
+++ b/deploy/pipelines/05-DB-and-SAP-install.yaml
@@ -245,7 +245,7 @@ stages:
   - Prepare_DB_SAP_Installation
   - SAP_OS_Config
   - BOM_Processing
-  - HANA_DB_Install
+  - DB_Install
   - SCS_Install
   jobs:
   - job: DB_Load

From 4d14a58bee90546f59d0ab9e33861b54a1bae7de Mon Sep 17 00:00:00 2001
From: Michael Mergell <mimergel@microsoft.com>
Date: Thu, 25 Nov 2021 08:20:16 +0000
Subject: [PATCH 14/19] Update deploy/pipelines/05-DB-and-SAP-install.yaml

Co-authored-by: Kimmo Forss <kimmo.forss@microsoft.com>
---
 deploy/pipelines/05-DB-and-SAP-install.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/pipelines/05-DB-and-SAP-install.yaml b/deploy/pipelines/05-DB-and-SAP-install.yaml
index a9479d4601..6ffced5f45 100644
--- a/deploy/pipelines/05-DB-and-SAP-install.yaml
+++ b/deploy/pipelines/05-DB-and-SAP-install.yaml
@@ -198,7 +198,7 @@ stages:
         failOnStderr: false
 
 
-- stage: HANA_DB_Install
+- stage: DB_Install
   condition: eq(${{ parameters.hanadbinstall }}, true)
   dependsOn:
   - Prepare_DB_SAP_Installation

From 20177ab6598e516cc003f3f4152c9c6386480db7 Mon Sep 17 00:00:00 2001
From: Michael Mergell <mimergel@microsoft.com>
Date: Thu, 25 Nov 2021 08:20:28 +0000
Subject: [PATCH 15/19] Update deploy/pipelines/05-DB-and-SAP-install.yaml

Co-authored-by: Kimmo Forss <kimmo.forss@microsoft.com>
---
 deploy/pipelines/05-DB-and-SAP-install.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/pipelines/05-DB-and-SAP-install.yaml b/deploy/pipelines/05-DB-and-SAP-install.yaml
index 6ffced5f45..46a45b7518 100644
--- a/deploy/pipelines/05-DB-and-SAP-install.yaml
+++ b/deploy/pipelines/05-DB-and-SAP-install.yaml
@@ -36,7 +36,7 @@ parameters:
   default: true
 
 - name: hanadbinstall
-  displayName: HANA DB Install 
+  displayName: Database Install 
   type: boolean
   default: true
 

From 984b9dc61aae92657660b77069b2d74b5c41e55f Mon Sep 17 00:00:00 2001
From: Michael Mergell <mimergel@microsoft.com>
Date: Thu, 25 Nov 2021 08:20:39 +0000
Subject: [PATCH 16/19] Update deploy/pipelines/05-DB-and-SAP-install.yaml

Co-authored-by: Kimmo Forss <kimmo.forss@microsoft.com>
---
 deploy/pipelines/05-DB-and-SAP-install.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/pipelines/05-DB-and-SAP-install.yaml b/deploy/pipelines/05-DB-and-SAP-install.yaml
index 46a45b7518..db8f94ccf2 100644
--- a/deploy/pipelines/05-DB-and-SAP-install.yaml
+++ b/deploy/pipelines/05-DB-and-SAP-install.yaml
@@ -205,7 +205,7 @@ stages:
   - SAP_OS_Config
   - BOM_Processing
   jobs:
-  - job: HANA_DB_Install
+  - job: DB_Install
     steps:
     - checkout: none
     - task: Ansible@0

From 5d7daf1fa3459317982632fe13c070e3daab36dc Mon Sep 17 00:00:00 2001
From: Michael Mergell <mimergel@microsoft.com>
Date: Thu, 25 Nov 2021 08:20:52 +0000
Subject: [PATCH 17/19] Update deploy/pipelines/05-DB-and-SAP-install.yaml

Co-authored-by: Kimmo Forss <kimmo.forss@microsoft.com>
---
 deploy/pipelines/05-DB-and-SAP-install.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/pipelines/05-DB-and-SAP-install.yaml b/deploy/pipelines/05-DB-and-SAP-install.yaml
index db8f94ccf2..c8b271becd 100644
--- a/deploy/pipelines/05-DB-and-SAP-install.yaml
+++ b/deploy/pipelines/05-DB-and-SAP-install.yaml
@@ -35,7 +35,7 @@ parameters:
   type: boolean
   default: true
 
-- name: hanadbinstall
+- name: dbinstall
   displayName: Database Install 
   type: boolean
   default: true

From b5aab622f473f2f78600cb3c56a9da30fbca70c2 Mon Sep 17 00:00:00 2001
From: Michael Mergell <mimergel@microsoft.com>
Date: Thu, 25 Nov 2021 08:21:02 +0000
Subject: [PATCH 18/19] Update deploy/pipelines/05-DB-and-SAP-install.yaml

Co-authored-by: Kimmo Forss <kimmo.forss@microsoft.com>
---
 deploy/pipelines/05-DB-and-SAP-install.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/pipelines/05-DB-and-SAP-install.yaml b/deploy/pipelines/05-DB-and-SAP-install.yaml
index c8b271becd..f8622ce908 100644
--- a/deploy/pipelines/05-DB-and-SAP-install.yaml
+++ b/deploy/pipelines/05-DB-and-SAP-install.yaml
@@ -209,7 +209,7 @@ stages:
     steps:
     - checkout: none
     - task: Ansible@0
-      displayName: HANA_DB_Install
+      displayName: DB_Install
       inputs:
         ansibleInterface: 'agentMachine'
         playbookPathOnAgentMachine: 'sap-automation/deploy/ansible/playbook_04_00_00_hana_db_install.yaml'

From 6fdb5954ee1076386aadbe783bdb480de5cf4663 Mon Sep 17 00:00:00 2001
From: Michael Mergell <mimergel@microsoft.com>
Date: Thu, 25 Nov 2021 08:22:54 +0000
Subject: [PATCH 19/19] Update deploy/pipelines/05-DB-and-SAP-install.yaml

Co-authored-by: Kimmo Forss <kimmo.forss@microsoft.com>
---
 deploy/pipelines/05-DB-and-SAP-install.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/pipelines/05-DB-and-SAP-install.yaml b/deploy/pipelines/05-DB-and-SAP-install.yaml
index f8622ce908..63c398bdaf 100644
--- a/deploy/pipelines/05-DB-and-SAP-install.yaml
+++ b/deploy/pipelines/05-DB-and-SAP-install.yaml
@@ -212,7 +212,7 @@ stages:
       displayName: DB_Install
       inputs:
         ansibleInterface: 'agentMachine'
-        playbookPathOnAgentMachine: 'sap-automation/deploy/ansible/playbook_04_00_00_hana_db_install.yaml'
+        playbookPathOnAgentMachine: 'sap-automation/deploy/ansible/playbook_04_00_00_db_install.yaml'
         inventoriesAgentMachine: 'file'
         inventoryFileOnAgentMachine: 'sap_hosts.yaml'
         args: '--private-key sshkey -e "@SYSTEM/$(sapsystemfolder)/sap-parameters.yaml" -e "_workspace_directory=$(Build.Repository.LocalPath)/SYSTEM/$(sapsystemfolder)/"'