Merge changes from stage to main branch (PR #78).

Author: marcelmamula

deploy_scenarios/sap_bw4hana_sandbox/ansible_extravars.yml

@@ -35,19 +35,19 @@
         sap_ha_install_hana_hsr_instance_number: "{{ sap_system_hana_db_instance_nr_register.user_input }}"
       when: sap_system_hana_db_instance_nr is not defined
 
-    - name: Fail if sap_swpm_master_password is invalid
+    - name: Fail if sap_system_hana_db_instance_nr is invalid
       ansible.builtin.fail:
         msg: |
-          Invalid value for variable 'sap_swpm_master_password': '{{ sap_swpm_master_password }}'
+          Invalid value for variable 'sap_system_hana_db_instance_nr': '{{ sap_system_hana_db_instance_nr | string }}'
           Required length of SAP HANA Instance Number is 2 letters.
           {% if sap_system_hana_db_instance_nr_register.user_input is not defined -%}
             Correct this variable in extra vars or remove it from extra vars to enable interactive prompt.
           {% else -%}
             Re-run the playbook and provide a valid input.
           {% endif %}
       when:
-        - sap_system_hana_db_instance_nr | length != 2
-          or sap_system_hana_db_instance_nr is not match('^[0-9]+$')  # Accepts only numbers
+        - sap_system_hana_db_instance_nr | string | length != 2
+          or sap_system_hana_db_instance_nr | string is not match('^[0-9]+$')  # Accepts only numbers
 
 
 # Passwords

deploy_scenarios/sap_bw4hana_sandbox/optional/interactive/databases/hana.yml

@@ -137,12 +137,12 @@
         sap_system_nwas_abap_ascs_instance_nr: "{{ sap_system_nwas_abap_ascs_instance_nr_register.user_input }}"
         sap_swpm_ascs_instance_nr: "{{ sap_system_nwas_abap_ascs_instance_nr_register.user_input }}"
         sap_ha_pacemaker_cluster_nwas_ascs_instance_nr: "{{ sap_system_nwas_abap_ascs_instance_nr_register.user_input }}"
-      when: sap_system_nwas_abap_ascs_instance_nr is not defined or sap_swpm_ascs_instance_nr is not defined
+      when: sap_system_nwas_abap_ascs_instance_nr is not defined
 
     - name: Fail if sap_system_nwas_abap_ascs_instance_nr is invalid
       ansible.builtin.fail:
         msg: |
-          Invalid value for variable 'sap_system_nwas_abap_ascs_instance_nr': '{{ sap_system_nwas_abap_ascs_instance_nr }}'
+          Invalid value for variable 'sap_system_nwas_abap_ascs_instance_nr': '{{ sap_system_nwas_abap_ascs_instance_nr | string }}'
           Required length of SAP ABAP System Central Service Instance Number is 2 letters.
           {% if sap_system_nwas_abap_ascs_instance_nr_register.user_input is not defined -%}
             Correct this variable in extra vars or remove it from extra vars to enable interactive prompt.
@@ -151,7 +151,7 @@
           {% endif %}
       when:
         - sap_system_nwas_abap_ascs_instance_nr | string | length != 2
-          or sap_system_nwas_abap_ascs_instance_nr is not match('^[0-9]+$')  # Accepts only numbers
+          or sap_system_nwas_abap_ascs_instance_nr | string is not match('^[0-9]+$')  # Accepts only numbers
 
 
 - name: Block for sap_system_nwas_java_scs_instance_nr
@@ -170,12 +170,12 @@
         sap_system_nwas_java_scs_instance_nr: "{{ sap_system_nwas_java_scs_instance_nr_register.user_input }}"
         sap_swpm_java_scs_instance_nr: "{{ sap_system_nwas_java_scs_instance_nr_register.user_input }}"
         sap_ha_pacemaker_cluster_nwas_scs_instance_nr: "{{ sap_system_nwas_java_scs_instance_nr_register.user_input }}"
-      when: sap_system_nwas_java_scs_instance_nr is not defined or sap_swpm_ascs_instance_nr is not defined
+      when: sap_system_nwas_java_scs_instance_nr is not defined
 
     - name: Fail if sap_system_nwas_java_scs_instance_nr is invalid
       ansible.builtin.fail:
         msg: |
-          Invalid value for variable 'sap_system_nwas_java_scs_instance_nr': '{{ sap_system_nwas_java_scs_instance_nr }}'
+          Invalid value for variable 'sap_system_nwas_java_scs_instance_nr': '{{ sap_system_nwas_java_scs_instance_nr | string }}'
           Required length of SAP JAVA System Central Service Instance Number is 2 letters.
           {% if sap_system_nwas_java_scs_instance_nr_register.user_input is not defined -%}
             Correct this variable in extra vars or remove it from extra vars to enable interactive prompt.
@@ -184,7 +184,7 @@
           {% endif %}
       when:
         - sap_system_nwas_java_scs_instance_nr | string | length != 2
-          or sap_system_nwas_java_scs_instance_nr is not match('^[0-9]+$')  # Accepts only numbers
+          or sap_system_nwas_java_scs_instance_nr | string is not match('^[0-9]+$')  # Accepts only numbers
 
 
 # Used for all distributed_ha scenarios
@@ -204,12 +204,12 @@
         sap_system_nwas_abap_ers_instance_nr: "{{ sap_system_nwas_abap_ers_instance_nr_register.user_input }}"
         sap_swpm_ers_instance_nr: "{{ sap_system_nwas_abap_ers_instance_nr_register.user_input }}"
         sap_ha_pacemaker_cluster_nwas_ers_instance_nr: "{{ sap_system_nwas_abap_ers_instance_nr_register.user_input }}"
-      when: sap_system_nwas_abap_ers_instance_nr is not defined or sap_swpm_ers_instance_nr is not defined
+      when: sap_system_nwas_abap_ers_instance_nr is not defined
 
     - name: Fail if sap_system_nwas_abap_ers_instance_nr is invalid
       ansible.builtin.fail:
         msg: |
-          Invalid value for variable 'sap_system_nwas_abap_ers_instance_nr': '{{ sap_system_nwas_abap_ers_instance_nr }}'
+          Invalid value for variable 'sap_system_nwas_abap_ers_instance_nr': '{{ sap_system_nwas_abap_ers_instance_nr | string }}'
           Required length of SAP Enqueue Replication Service Instance Number is 2 letters.
           {% if sap_system_nwas_abap_ers_instance_nr_register.user_input is not defined -%}
             Correct this variable in extra vars or remove it from extra vars to enable interactive prompt.
@@ -218,7 +218,7 @@
           {% endif %}
       when:
         - sap_system_nwas_abap_ers_instance_nr | string | length != 2
-          or sap_system_nwas_abap_ers_instance_nr is not match('^[0-9]+$')  # Accepts only numbers
+          or sap_system_nwas_abap_ers_instance_nr | string is not match('^[0-9]+$')  # Accepts only numbers
 
 
 # Used for all scenarios except dedicated HANA scenarios
@@ -237,12 +237,12 @@
       ansible.builtin.set_fact:
         sap_system_nwas_abap_pas_instance_nr: "{{ sap_system_nwas_abap_pas_instance_nr_register.user_input }}"
         sap_swpm_pas_instance_nr: "{{ sap_system_nwas_abap_pas_instance_nr_register.user_input }}"
-      when: sap_system_nwas_abap_pas_instance_nr is not defined or sap_swpm_pas_instance_nr is not defined
+      when: sap_system_nwas_abap_pas_instance_nr is not defined
 
     - name: Fail if sap_system_nwas_abap_pas_instance_nr is invalid
       ansible.builtin.fail:
         msg: |
-          Invalid value for variable 'sap_system_nwas_abap_pas_instance_nr': '{{ sap_system_nwas_abap_pas_instance_nr }}'
+          Invalid value for variable 'sap_system_nwas_abap_pas_instance_nr': '{{ sap_system_nwas_abap_pas_instance_nr | string }}'
           Required length of SAP Primary Application Server Instance Number is 2 letters.
           {% if sap_system_nwas_abap_pas_instance_nr_register.user_input is not defined -%}
             Correct this variable in extra vars or remove it from extra vars to enable interactive prompt.
@@ -251,7 +251,7 @@
           {% endif %}
       when:
         - sap_system_nwas_abap_pas_instance_nr | string | length != 2
-          or sap_system_nwas_abap_pas_instance_nr is not match('^[0-9]+$')  # Accepts only numbers
+          or sap_system_nwas_abap_pas_instance_nr | string is not match('^[0-9]+$')  # Accepts only numbers
 
 
 # Used for all distributed scenarios
@@ -270,12 +270,12 @@
       ansible.builtin.set_fact:
         sap_system_nwas_abap_aas_instance_nr: "{{ sap_system_nwas_abap_aas_instance_nr_register.user_input }}"
         sap_swpm_aas_instance_nr: "{{ sap_system_nwas_abap_aas_instance_nr_register.user_input }}"
-      when: sap_system_nwas_abap_aas_instance_nr is not defined or sap_swpm_aas_instance_nr is not defined
+      when: sap_system_nwas_abap_aas_instance_nr is not defined
 
     - name: Fail if sap_system_nwas_abap_aas_instance_nr is invalid
       ansible.builtin.fail:
         msg: |
-          Invalid value for variable 'sap_system_nwas_abap_aas_instance_nr': '{{ sap_system_nwas_abap_aas_instance_nr }}'
+          Invalid value for variable 'sap_system_nwas_abap_aas_instance_nr': '{{ sap_system_nwas_abap_aas_instance_nr | string }}'
           Required length of SAP Additional Application Server Instance Number is 2 letters.
           {% if sap_system_nwas_abap_aas_instance_nr_register.user_input is not defined -%}
             Correct this variable in extra vars or remove it from extra vars to enable interactive prompt.
@@ -284,4 +284,4 @@
           {% endif %}
       when:
         - sap_system_nwas_abap_aas_instance_nr | string | length != 2
-          or sap_system_nwas_abap_aas_instance_nr is not match('^[0-9]+$')  # Accepts only numbers
+          or sap_system_nwas_abap_aas_instance_nr | string is not match('^[0-9]+$')  # Accepts only numbers

deploy_scenarios/sap_bw4hana_sandbox/optional/interactive/mandatory_vars.yml

@@ -5,14 +5,14 @@
 
 # Each dictionary[plan] key is checked for 'sap_host_type' value, which can accept new 'sap_vm_provision_group_*' variables.
 
-- name: Fail if 'sap_vm_provision_{{ sap_vm_provision_iac_platform }}_host_specifications_dictionary' is undefined
+- name: Fail if 'sap_vm_provision_{{ sap_vm_provision_iac_platform }}_host_specifications_dictionary' is undefined or empty
   ansible.builtin.fail:
     msg: |
-      Variable 'sap_vm_provision_{{ sap_vm_provision_iac_platform }}_host_specifications_dictionary' is undefined.
+      Variable 'sap_vm_provision_{{ sap_vm_provision_iac_platform }}_host_specifications_dictionary' is undefined or empty.
       Correct this variable in extra vars and re-run the playbook.
   when:
-    - "'sap_vm_provision_' + sap_vm_provision_iac_platform + '_host_specifications_dictionary' not in vars"
-    - lookup('ansible.builtin.vars', 'sap_vm_provision_' + sap_vm_provision_iac_platform + '_host_specifications_dictionary') | length == 0
+    - "'sap_vm_provision_' + sap_vm_provision_iac_platform + '_host_specifications_dictionary' not in vars
+      or lookup('ansible.builtin.vars', 'sap_vm_provision_' + sap_vm_provision_iac_platform + '_host_specifications_dictionary') | length == 0"
 
 - name: Block for sap_vm_provision_host_specification_plan
   vars:
@@ -72,7 +72,7 @@
     sap_playbook_host_hana_primary_hostname: "{{ sap_playbook_host_hana_primary_list[0] }}"
   when: sap_playbook_host_hana_primary_list | d([]) | length > 0
 
-# HANA scenarios require at least one hana_primary node
+# HANA scenarios require at least one hana_primary node (including Sandbox)
 - name: Fail if required hosts are not present - SAP HANA
   ansible.builtin.fail:
     msg: |
@@ -133,6 +133,7 @@
       'sap_host_type': {{ sap_vm_provision_group_nwas_ascs | d('nwas_ascs') }}
       Correct this variable in extra vars re-run the playbook.
   when:
+    - sap_playbook_interactive_layout in ['distributed', 'distributed_ha']
     - sap_playbook_interactive_product not in ['hana', 'nwas_java']
     - sap_playbook_host_nwas_ascs_list | d([]) | length == 0
 
@@ -158,7 +159,8 @@
       'sap_host_type': {{ sap_vm_provision_group_nwas_scs | d('nwas_scs') }}
       Correct this variable in extra vars re-run the playbook.
   when:
-    - sap_playbook_interactive_product not in ['hana', 'nwas_java']
+    - sap_playbook_interactive_layout in ['distributed', 'distributed_ha']
+    - sap_playbook_interactive_product not in ['hana', 'nwas_abap']
     - sap_playbook_host_nwas_scs_list | d([]) | length == 0
 
 
@@ -226,6 +228,10 @@
       Correct this variable in extra vars re-run the playbook.
   when:
     - sap_playbook_interactive_product not in ['hana']
+    # PAS is part of non-HANA Sandbox systems, Standard, Distributed and Distributed HA
+    - sap_playbook_interactive_layout in ['distributed', 'distributed_ha']
+      or sap_playbook_interactive_product in ['ecc', 'nwas_abap', 'nwas_java'] and sap_playbook_interactive_layout == 'sandbox' and sap_playbook_interactive_database != 'hana'
+      or sap_playbook_interactive_product in ['s4hana', 'bw4hana'] and sap_playbook_interactive_layout in ['standard', 'standard_scaleout']
     - sap_playbook_host_nwas_pas_list | d([]) | length == 0
 
 

deploy_scenarios/sap_bw4hana_sandbox/optional/interactive/process_host_spec_dictionary.yml

@@ -35,19 +35,19 @@
         sap_ha_install_hana_hsr_instance_number: "{{ sap_system_hana_db_instance_nr_register.user_input }}"
       when: sap_system_hana_db_instance_nr is not defined
 
-    - name: Fail if sap_swpm_master_password is invalid
+    - name: Fail if sap_system_hana_db_instance_nr is invalid
       ansible.builtin.fail:
         msg: |
-          Invalid value for variable 'sap_swpm_master_password': '{{ sap_swpm_master_password }}'
+          Invalid value for variable 'sap_system_hana_db_instance_nr': '{{ sap_system_hana_db_instance_nr | string }}'
           Required length of SAP HANA Instance Number is 2 letters.
           {% if sap_system_hana_db_instance_nr_register.user_input is not defined -%}
             Correct this variable in extra vars or remove it from extra vars to enable interactive prompt.
           {% else -%}
             Re-run the playbook and provide a valid input.
           {% endif %}
       when:
-        - sap_system_hana_db_instance_nr | length != 2
-          or sap_system_hana_db_instance_nr is not match('^[0-9]+$')  # Accepts only numbers
+        - sap_system_hana_db_instance_nr | string | length != 2
+          or sap_system_hana_db_instance_nr | string is not match('^[0-9]+$')  # Accepts only numbers
 
 
 # Passwords