Pipeline hotfixes

Webapp/SDAF/Models/LandscapeModel.cs

@@ -221,6 +221,8 @@ public bool IsValid()
 
     public string resourcegroup_name { get; set; }
 
+    public bool? prevent_deletion_if_contains_resources { get; set; } = true;
+
     /*---------------------------------------------------------------------------8
     |                                                                            |
     |                       Azure NetApp Files information                       |

Webapp/SDAF/ParameterDetails/LandscapeDetails.json

@@ -120,6 +120,15 @@
         "Options": [],
         "Overrules": "",
         "Display": 2
+      },
+      {
+        "Name": "prevent_deletion_if_contains_resources",
+        "Required": false,
+        "Description": "Prevent deletion of resource group if there are Resources left within the Resource Group during deletion",
+        "Type": "checkbox",
+        "Options": [],
+        "Overrules": "",
+        "Display": 2
       }
     ]
   },

Webapp/SDAF/ParameterDetails/LandscapeTemplate.txt

@@ -305,7 +305,8 @@ $$resourcegroup_name$$
 # The resourcegroup_name arm_id is optional, it can be used to provide an existing resource group for the deployment
 $$resourcegroup_arm_id$$
 
-
+# Prevent deletion of resource group if there are Resources left within the Resource Group during deletion
+$$prevent_deletion_if_contains_resources$$
 
 #########################################################################################
 #                                                                                       #

deploy/ansible/roles-os/1.17-generic-pacemaker/tasks/1.17.1-pre_checks.yml

@@ -6,14 +6,12 @@
 # |                                                                            |
 # +------------------------------------4--------------------------------------*/
 
-- name:                                "1.17 Generic Pacemaker: - Ensure passlib is installed"
-  ansible.builtin.pip:
-    name:                              passlib
-    state:                             present
-  vars:
-    ansible_python_interpreter:        "python3"
-  tags:
-    - always
+# - name:                                "1.17 Generic Pacemaker: - Ensure passlib is installed"
+#   ansible.builtin.pip:
+#     name:                              passlib
+#     state:                             present
+#   tags:
+#     - always
 
 
 # /*---------------------------------------------------------------------------8

deploy/ansible/roles-os/1.4-packages/vars/os-packages.yaml

@@ -339,33 +339,35 @@ packages:
     - { tier: 'ha',     package: 'socat',                                        node_tier: 'all',     state: 'present' }
     - { tier: 'ha',     package: 'corosync',                                     node_tier: 'all',     state: 'present' }
     - { tier: 'ha',     package: 'resource-agents>=4.3',                         node_tier: 'all',     state: 'present' }
-    - { tier: 'ha',     package: 'fence-agents>=4.4.0',                          node_tier: 'all',     state: 'present' }
     - { tier: 'ha',     package: 'cloud-netconfig-azure>=1.3',                   node_tier: 'all',     state: 'present' }
   # Assumption: Public_Cloud_Module_x86_64 already available
     - { tier: 'ha',     package: 'python-azure-mgmt-compute',                    node_tier: 'all',     state: 'present' }
     - { tier: 'ha',     package: 'python-azure-identity',                        node_tier: 'all',     state: 'present' }  # Added as part of documentation update
-    - { tier: 'ha',     package: 'sap-suse-cluster-connector',                   node_tier: 'hana',     state: 'present' }
+    - { tier: 'ha',     package: 'sap-suse-cluster-connector',                   node_tier: 'hana',    state: 'present' }
     - { tier: 'ha',     package: 'sap-suse-cluster-connector',                   node_tier: 'scs',     state: 'present' }
     - { tier: 'ha',     package: 'sap-suse-cluster-connector',                   node_tier: 'ers',     state: 'present' }
   # -------------------------- End - packages required for Clustering ------------------------------------8
   sles_sap12.4:
   # --------------------------- Begin - Packages required for SYBASE -----------------------------------------8
     # 2371942 - Error Executing isql or dscp on SAP ASE or SAP HANA Accelerator for SAP ASE
-    - { tier: 'os',     package: 'glibc-32bit',                                  node_tier: 'sybase',     state: 'present' }
+    - { tier: 'os',     package: 'glibc-32bit',                                  node_tier: 'sybase',  state: 'present' }
+    - { tier: 'ha',     package: 'fence-agents>=4.4.0',                          node_tier: 'all',     state: 'present' }
     # --------------------------- End - Packages required for SYBASE -------------------------------------------8
   sles_sap12.5:
   # --------------------------- Begin - Packages required for SYBASE -----------------------------------------8
     # 2371942 - Error Executing isql or dscp on SAP ASE or SAP HANA Accelerator for SAP ASE
-    - { tier: 'os',     package: 'glibc-32bit',                                  node_tier: 'sybase',     state: 'present' }
-    # --------------------------- End - Packages required for SYBASE -------------------------------------------8
+    - { tier: 'os',     package: 'glibc-32bit',                                  node_tier: 'sybase',  state: 'present' }
+    - { tier: 'ha',     package: 'fence-agents-azure-arm',                       node_tier: 'scs',     state: 'present' }
+    - { tier: 'ha',     package: 'fence-agents-azure-arm',                       node_tier: 'ers',     state: 'present' }
+    - { tier: 'ha',     package: 'fence-agents-azure-arm',                       node_tier: 'hana',    state: 'present' }    # --------------------------- End - Packages required for SYBASE -------------------------------------------8
   sles_sap15:
     - { tier: 'os',     package: 'chrony',                                       node_tier: 'all',     state: 'present' }
 #   - { tier: 'os',     package: 'libyui-qt-pkg11',                              node_tier: 'all',     state: 'present' }
     - { tier: 'os',     package: 'glibc',                                        node_tier: 'all',     state: 'present' }
     - { tier: 'os',     package: 'systemd',                                      node_tier: 'all',     state: 'present' }
     - { tier: 'os',     package: 'tuned',                                        node_tier: 'all',     state: 'present' }
     - { tier: 'os',     package: 'numad',                                        node_tier: 'all',     state: 'present' }
-    - { tier: 'os',     package: 'ntp',                                          node_tier: 'all',     state: 'absent' }
+    - { tier: 'os',     package: 'ntp',                                          node_tier: 'all',     state: 'absent'  }
     - { tier: 'os',     package: 'unrar',                                        node_tier: 'scs',     state: 'present' }
     # --------------------------- Begin - Packages required for DB2 -----------------------------------------8
     # https://www.ibm.com/docs/en/db2/11.5?topic=servers-linux

deploy/pipelines/01-deploy-control-plane.yaml

@@ -123,7 +123,7 @@ stages:
 
                             printf -v tempval '%s id:' $(variable_group)
                             printf -v val '%-20s' "${tempval}"
-                            echo "$val                  $VARIABLE_GROUP_ID"
+                            echo "$val                 $VARIABLE_GROUP_ID"
 
                             if [ "${{ parameters.force_reset }}" = "True" ]; then
                               echo "##vso[task.logissue type=warning]Forcing a re-install"
@@ -161,7 +161,8 @@ stages:
                               step=0
                             else
                               if [ -f ${deployer_environment_file_name} ]; then
-                                step=$(cat ${deployer_environment_file_name}  | grep step= | awk -F'=' '{print $2}' | xargs) ; echo 'Step' ${step}
+                                step=$(cat ${deployer_environment_file_name}  | grep step= | awk -F'=' '{print $2}' | xargs)
+                                echo "Step:                              $(this_agent)"
                                 if [ "0" != ${step} ]; then
                                   exit 0
                                 fi
@@ -220,10 +221,10 @@ stages:
                             deployer_environment_file_name=$CONFIG_REPO_PATH/.sap_deployment_automation/${ENVIRONMENT}$LOCATION
                         echo -e "$green--- Deploy the Control Plane ---$reset"
                             if [ -n "$(PAT)" ]; then
-                                echo "Deployer Agent PAT:                    IsDefined"
+                                echo "Deployer Agent PAT:                  IsDefined"
                             fi
                             if [ -n "$(POOL)" ]; then
-                                echo "  Deployer Agent Pool:                   $(POOL)"
+                                echo "  Deployer Agent Pool:               $(POOL)"
 
                             fi
                             if [ -f ${CONFIG_REPO_PATH}/DEPLOYER/$(deployerfolder)/state.zip ]; then
@@ -245,7 +246,7 @@ stages:
                             if [ "$USE_MSI" = "true" ]; then
                               export ARM_CLIENT_SECRET=$servicePrincipalKey
                               export ARM_SUBSCRIPTION_ID=$ARM_SUBSCRIPTION_ID
-                              echo "Deployment credentials:              Managed Identity"
+                              echo "Deployment credentials:                Managed Identity"
 
 
                               $SAP_AUTOMATION_REPO_PATH/deploy/scripts/deploy_controlplane.sh                               \
@@ -260,8 +261,8 @@ stages:
                               export ARM_USE_OIDC=false
                               export ARM_USE_AZUREAD=true
 
-                              echo "Deployment credentials:               Service Principal"
-                              echo "Deployment credential ID (SPN):      $WL_ARM_CLIENT_ID"
+                              echo "Deployment credentials:              Service Principal"
+                              echo "Deployment credential ID (SPN):      $CP_ARM_CLIENT_ID"
 
                               az login --service-principal -u $ARM_CLIENT_ID -p=$ARM_CLIENT_SECRET --tenant $ARM_TENANT_ID --output none
 
@@ -578,7 +579,7 @@ stages:
                             exit 2
                         fi
                         TF_VAR_app_registration_app_id=$(APP_REGISTRATION_APP_ID);
-                        echo "App Registration ID:                ${TF_VAR_app_registration_app_id}"
+                        echo "App Registration ID:                  ${TF_VAR_app_registration_app_id}"
                         export TF_VAR_app_registration_app_id
                         TF_VAR_webapp_client_secret=$(WEB_APP_CLIENT_SECRET)
                         export TF_VAR_webapp_client_secret
@@ -676,9 +677,9 @@ stages:
                         . /etc/profile.d/deploy_server.sh ; /opt/bin/terraform/terraform --version
 
                         if [ $USE_MSI != "true" ]; then
-                            echo "Deployment credentials:                Service Principal"
-                            echo "Deployment credential ID (SPN):        $CP_ARM_CLIENT_ID"
-                            echo "Deployer subscription:                 $CP_ARM_SUBSCRIPTION_ID"
+                            echo "Deployment credentials:              Service Principal"
+                            echo "Deployment credential ID (SPN):      $CP_ARM_CLIENT_ID"
+                            echo "Deployer subscription:               $CP_ARM_SUBSCRIPTION_ID"
 
                             export ARM_CLIENT_ID=$CP_ARM_CLIENT_ID
                             export ARM_CLIENT_SECRET=$CP_ARM_CLIENT_SECRET
@@ -765,9 +766,9 @@ stages:
 
                     sudo chmod +x $SAP_AUTOMATION_REPO_PATH/deploy/scripts/deploy_controlplane.sh
                     if [ $USE_MSI != "true" ]; then
-                        echo "Deployment credentials:                Service Principal"
-                        echo "Deployment credential ID (SPN):        $CP_ARM_CLIENT_ID"
-                        echo "Deployer subscription:                 $CP_ARM_SUBSCRIPTION_ID"
+                        echo "Deployment credentials:              Service Principal"
+                        echo "Deployment credential ID (SPN):      $CP_ARM_CLIENT_ID"
+                        echo "Deployer subscription:               $CP_ARM_SUBSCRIPTION_ID"
 
                         export TF_VAR_use_spn=true
 

deploy/pipelines/02-sap-workload-zone.yaml

@@ -462,7 +462,7 @@ stages:
                   --region "${LOCATION}" --subscription $ARM_SUBSCRIPTION_ID --spn_id $ARM_CLIENT_ID --spn_secret "${ARM_CLIENT_SECRET}"  \
                   --tenant_id $ARM_TENANT_ID --keyvault_subscription $STATE_SUBSCRIPTION
                   secrets_set=$? ;
-                  echo "Set Secrets returned:                  $secrets_set"
+                  echo "Set Secrets returned:                $secrets_set"
 
               else
                   echo "Deployment credentials:                Managed Identity"
@@ -476,9 +476,6 @@ stages:
               debug_variable=''
 
               if [ $USE_MSI != "true" ]; then
-                  echo "Deployment credentials:                Service Principal"
-                  echo "Service Principal:                     $WL_ARM_CLIENT_ID"
-                  echo "Service Principal (OID)                $WL_ARM_OBJECT_ID"
 
                   isUserAccessAdmin=$(az role assignment list --role "User Access Administrator" --subscription $STATE_SUBSCRIPTION   --assignee $WL_ARM_OBJECT_ID --query "[].principalName | [0]" --output tsv)
 

deploy/pipelines/03-sap-system-deployment.yaml

@@ -261,7 +261,7 @@ stages:
 
                 if [ $USE_MSI != "true" ]; then
                   echo "Deployment credentials:              Service Principal"
-                  echo "Deployment credential ID (SPN):     $WL_ARM_CLIENT_ID"
+                  echo "Deployment credential ID (SPN):      $WL_ARM_CLIENT_ID"
 
                   export ARM_CLIENT_ID=$WL_ARM_CLIENT_ID
                   export ARM_CLIENT_SECRET=$WL_ARM_CLIENT_SECRET
@@ -276,7 +276,7 @@ stages:
                     exit $return_code
                   fi
                 else
-                  echo "Deployment credentials:              Managed Identity"
+                  echo "Deployment credentials:               Managed Identity"
                   export ARM_USE_MSI=true
                   export ARM_SUBSCRIPTION_ID=$WL_ARM_SUBSCRIPTION_ID
                   unset ARM_TENANT_ID