SLES 12 SP5 fixes (Azure#658)

* Fix conditional statement in install_workloadzone.sh * Fix subscription_id assignment in providers.tf * Fix indentation in deployment credential messages * Fix deployment credential messages and subscription_id assignment * chore: enable Azure scheduled events resource start and display output on SUSE * Refactor deployment script to improve readability and remove unnecessary output * Update provider version to 4.7 * Refactor tfvar_variables.tf to add a new variable for preventing deletion of resource groups with resources * Add prevent_deletion_if_contains_resources variable to SystemModel.cs * Refactor deployment script to improve readability and display deployment credentials * Refactor deployment script to enable Stonith and concurrent fencing * Refactor tfvar_variables.tf to add prevent_deletion_if_contains_resources variable * Refactor validate.yml to remove single quotes from crm_resource output * Refactor validate.yml to remove single quotes from crm_resource output * fix ansible schema errors * Refactor validate.yml to remove unnecessary 'when' condition --------- Co-authored-by: Kimmo Forss <[email protected]> Co-authored-by: hdamecharla <[email protected]>
KimForss · Oct 31, 2024 · 642801c · 642801c
1 parent bc72b2f
commit 642801c
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 10 deletions.
diff --git a/deploy/pipelines/02-sap-workload-zone.yaml b/deploy/pipelines/02-sap-workload-zone.yaml
@@ -432,7 +432,7 @@ stages:
               echo -e "$green---az login ---$reset"
 
               echo -e "$cyan---Sourcing the deploy_server.sh file$reset"
-              . /etc/profile.d/deploy_server.sh ; /opt/bin/terraform/terraform --version
+              . /etc/profile.d/deploy_server.sh
 
               if [ $USE_MSI != "true" ]; then
 
@@ -465,7 +465,7 @@ stages:
                   echo "Set Secrets returned:                $secrets_set"
 
               else
-                  echo "Deployment credentials:                Managed Identity"
+                  echo "Deployment credentials:              Managed Identity"
                   # export ARM_SUBSCRIPTION_ID=$ARM_SUBSCRIPTION_ID
                   export ARM_USE_MSI=true
                   export ARM_USE_AZUREAD=true

diff --git a/deploy/pipelines/03-sap-system-deployment.yaml b/deploy/pipelines/03-sap-system-deployment.yaml
@@ -263,8 +263,6 @@ stages:
                 . /etc/profile.d/deploy_server.sh
                 export ARM_SUBSCRIPTION_ID=$WL_ARM_SUBSCRIPTION_ID
                 if [ $USE_MSI != "true" ]; then
-                  echo "Deployment credentials:              Service Principal"
-                  echo "Deployment credential ID (SPN):      $WL_ARM_CLIENT_ID"
 
                     echo "Deployment credentials:              Service Principal"
                     echo "Deployment credential ID (SPN):      $WL_ARM_CLIENT_ID"

diff --git a/deploy/terraform/run/sap_system/providers.tf b/deploy/terraform/run/sap_system/providers.tf
@@ -98,7 +98,7 @@ terraform                              {
                                                                          }
                                                               azurerm =  {
                                                                            source  = "hashicorp/azurerm"
-                                                                           version = "4.6.0"
+                                                                           version = "4.7.0"
                                                                          }
                                                             }
                                        }
diff --git a/deploy/terraform/terraform-units/modules/sap_deployer/providers.tf b/deploy/terraform/terraform-units/modules/sap_deployer/providers.tf
@@ -3,7 +3,7 @@ terraform {
     azurerm = {
       source                = "hashicorp/azurerm"
       configuration_aliases = [azurerm.dnsmanagement, azurerm.main]
-      version               = "4.6.0"
+      version               = "4.7.0"
     }
   }
 }
diff --git a/deploy/terraform/terraform-units/modules/sap_landscape/providers.tf b/deploy/terraform/terraform-units/modules/sap_landscape/providers.tf
@@ -3,7 +3,7 @@ terraform {
     azurerm = {
       source                = "hashicorp/azurerm"
       configuration_aliases = [azurerm.main, azurerm.deployer, azurerm.dnsmanagement, azurerm.peering, azurerm.privatelinkdnsmanagement]
-      version               = "4.6.0"
+      version               = "4.7.0"
     }
 
     azapi = {

diff --git a/deploy/terraform/terraform-units/modules/sap_library/providers.tf b/deploy/terraform/terraform-units/modules/sap_library/providers.tf
@@ -3,7 +3,7 @@ terraform {
     azurerm = {
       source                = "hashicorp/azurerm"
       configuration_aliases = [azurerm.main, azurerm.deployer, azurerm.dnsmanagement, azurerm.privatelinkdnsmanagement]
-      version               = "4.6.0"
+      version               = "4.7.0"
     }
   }
 }
diff --git a/deploy/terraform/terraform-units/modules/sap_system/anydb_node/providers.tf b/deploy/terraform/terraform-units/modules/sap_system/anydb_node/providers.tf
@@ -3,7 +3,7 @@ terraform {
     azurerm = {
       source                = "hashicorp/azurerm"
       configuration_aliases = [azurerm.main, azurerm.deployer, azurerm.dnsmanagement, azurerm.privatelinkdnsmanagement] //
-      version               = "4.6.0"
+      version               = "4.7.0"
     }
   }
 }
diff --git a/deploy/terraform/terraform-units/modules/sap_system/app_tier/providers.tf b/deploy/terraform/terraform-units/modules/sap_system/app_tier/providers.tf
@@ -3,7 +3,7 @@ terraform {
     azurerm = {
       source                = "hashicorp/azurerm"
       configuration_aliases = [azurerm.main, azurerm.deployer, azurerm.dnsmanagement, azurerm.privatelinkdnsmanagement] //
-      version               = "4.6.0"
+      version               = "4.7.0"
     }
   }
 }