all: Move provisioning domain variable to fragments, Add placeholder validation, improve rsync dest

common_fragments/vars/platform_vars_aws_ec2_vs.yml

@@ -19,6 +19,7 @@ sap_vm_provision_aws_vpc_subnet_id: "ENTER_STRING_VALUE_HERE" # VPC Subnet ID (S
 sap_vm_provision_aws_vpc_subnet_create_boolean:
   "{{ true | default(false) if sap_vm_provision_aws_vpc_subnet_id == 'new' else false }}"
 
+sap_vm_provision_dns_root_domain: "ENTER_STRING_VALUE_HERE"  # Root domain for DNS entries (e.g., example.com) (String).
 
 # Enter image name from dictionary sap_vm_provision_aws_ec2_vs_host_os_image_dictionary keys (String).
 # Example: sles-15-6-sap-ha (SUSE), rhel-9-4-sap-ha (Red Hat)

common_fragments/vars/platform_vars_gcp_ce_vm.yml

@@ -19,6 +19,8 @@ sap_vm_provision_gcp_region_zone: "ENTER_STRING_VALUE_HERE"  # Region zone (Stri
 sap_vm_provision_gcp_vpc_name: "ENTER_STRING_VALUE_HERE"  # VPC name (String).
 sap_vm_provision_gcp_vpc_subnet_name: "ENTER_STRING_VALUE_HERE"  # VPC Subnet name (String).
 
+sap_vm_provision_dns_root_domain: "ENTER_STRING_VALUE_HERE"  # Root domain for DNS entries (e.g., example.com) (String).
+
 # Enter image name from dictionary sap_vm_provision_gcp_ce_vm_host_os_image_dictionary keys (String)..
 # Example: sles-15-6-sap-ha (SUSE), rhel-9-latest (Red Hat)
 sap_vm_provision_gcp_ce_vm_host_os_image: "ENTER_STRING_VALUE_HERE"

common_fragments/vars/platform_vars_ibmcloud_powervs.yml

@@ -16,6 +16,8 @@ sap_vm_provision_ibmcloud_resource_group_name: "ENTER_STRING_VALUE_HERE" # Resou
 sap_vm_provision_ibmcloud_powervs_location: "ENTER_STRING_VALUE_HERE"  # Location (String).
 sap_vm_provision_ibmcloud_vpc_subnet_name: "ENTER_STRING_VALUE_HERE" # VPC Subnet name (String). only for ansible_to_terraform, can be name or 'new'
 
+sap_vm_provision_dns_root_domain: "ENTER_STRING_VALUE_HERE"  # Root domain for DNS entries (e.g., example.com) (String).
+
 # Enter image name from dictionary sap_vm_provision_ibmcloud_powervs_host_os_image_dictionary keys (String)..
 # Example: sles-15-5-sap-ha (SUSE), rhel-9-2-sap-ha (Red Hat)
 sap_vm_provision_ibmcloud_powervs_host_os_image: "ENTER_STRING_VALUE_HERE"

common_fragments/vars/platform_vars_ibmcloud_vs.yml

@@ -19,6 +19,8 @@ sap_vm_provision_ibmcloud_private_dns_instance_name: "ENTER_STRING_VALUE_HERE"
 sap_vm_provision_ibmcloud_vpc_name: "ENTER_STRING_VALUE_HERE" # VPC Name (String). if ansible_to_terraform, use "new"
 sap_vm_provision_ibmcloud_vpc_subnet_name: "ENTER_STRING_VALUE_HERE" # VPC Subnet name (String). if ansible_to_terraform, use "new"
 
+sap_vm_provision_dns_root_domain: "ENTER_STRING_VALUE_HERE"  # Root domain for DNS entries (e.g., example.com) (String).
+
 # Enter image name from dictionary sap_vm_provision_ibmcloud_vs_host_os_image_dictionary keys (String).
 # Example: sles-15-6-sap-ha (SUSE), rhel-9-4-sap-ha (Red Hat)
 sap_vm_provision_ibmcloud_vs_host_os_image: "ENTER_STRING_VALUE_HERE"

common_fragments/vars/platform_vars_ibmpowervm_vm.yml

@@ -22,6 +22,8 @@ sap_vm_provision_ibmpowervm_network_name: "ENTER_STRING_VALUE_HERE"  # Network n
 sap_vm_provision_ibmpowervm_network_vnic_type: "normal" # Virtual NIC Type (String). 'direct' == SR-IOV, 'normal' == Shared Ethernet Adapter (SEA)
 sap_vm_provision_ibmpowervm_storage_template_name: "ENTER_STRING_VALUE_HERE" # Storage template name (String). aka. Openstack Cinder Volume Type
 
+sap_vm_provision_dns_root_domain: "ENTER_STRING_VALUE_HERE"  # Root domain for DNS entries (e.g., example.com) (String).
+
 # IBM PowerVM Virtual Machine OS Image (see IBM PowerVC Web GUI for list) (String).
 sap_vm_provision_ibmpowervm_vm_host_os_image: "ENTER_STRING_VALUE_HERE"
 

common_fragments/vars/platform_vars_kubevirt_vm.yml

@@ -19,6 +19,8 @@ sap_vm_provision_kubevirt_vm_host_os_image_url: "ENTER_STRING_VALUE_HERE" # Imag
 sap_vm_provision_kubevirt_os_user: "ENTER_STRING_VALUE_HERE"  # Optional OS user name (String).
 sap_vm_provision_kubevirt_os_user_password: "ENTER_STRING_VALUE_HERE"  # Optional OS user password (String).
 
+sap_vm_provision_dns_root_domain: "ENTER_STRING_VALUE_HERE"  # Root domain for DNS entries (e.g., example.com) (String).
+
 # Variables required for sap_vm_provision_iac_type=ansible_to_terraform
 sap_vm_provision_terraform_state: "ENTER_STRING_VALUE_HERE" # present, absent
 sap_vm_provision_resource_prefix: "ENTER_STRING_VALUE_HERE"

common_fragments/vars/platform_vars_msazure_vm.yml

@@ -21,6 +21,8 @@ sap_vm_provision_msazure_location_availability_zone_no: 1  # ansible_to_terrafor
 sap_vm_provision_msazure_vnet_name: "ENTER_STRING_VALUE_HERE" # Virtual Network name (String). if ansible_to_terraform, use "new"
 sap_vm_provision_msazure_vnet_subnet_name: "ENTER_STRING_VALUE_HERE" # Virtual Network Subnet name (String). if ansible_to_terraform, use "new"
 
+sap_vm_provision_dns_root_domain: "ENTER_STRING_VALUE_HERE"  # Root domain for DNS entries (e.g., example.com) (String).
+
 # Enter image name from dictionary sap_vm_provision_msazure_vm_host_os_image_dictionary keys (String).
 # Example: sles-15-6-sap-ha (SUSE), rhel-9-4-sap-ha (Red Hat)
 sap_vm_provision_msazure_vm_host_os_image: "ENTER_STRING_VALUE_HERE"

common_fragments/vars/platform_vars_ovirt_vm.yml

@@ -28,6 +28,8 @@ sap_vm_provision_ovirt_vm_disk_type: "raw" # default is 'cow' = thin provisionin
 sap_vm_provision_ovirt_vm_timezone: "Etc/GMT"
 sap_vm_provision_ovirt_vm_operating_system: "other_linux"
 
+sap_vm_provision_dns_root_domain: "ENTER_STRING_VALUE_HERE"  # Root domain for DNS entries (e.g., example.com) (String).
+
 # OVirt VM option 1 - create from VM Template Name
 sap_vm_provision_ovirt_vm_template_name: "ENTER_STRING_VALUE_HERE"
 

common_fragments/vars/platform_vars_vmware_vm.yml

@@ -25,6 +25,8 @@ sap_vm_provision_vmware_vm_cluster_datastore_name: ""  # VM Cluster datastore na
 sap_vm_provision_vmware_vm_content_library_name: ""  # VM Content library name (String).
 sap_vm_provision_vmware_vm_template_name: ""  # VM template name (String).
 
+sap_vm_provision_dns_root_domain: "ENTER_STRING_VALUE_HERE"  # Root domain for DNS entries (e.g., example.com) (String).
+
 # Variables required for sap_vm_provision_iac_type=ansible_to_terraform
 # sap_vm_provision_terraform_state: "ENTER_STRING_VALUE_HERE" # present, absent
 # sap_vm_provision_resource_prefix: "ENTER_STRING_VALUE_HERE"

deploy_scenarios/sap_bw4hana_sandbox/ansible_extravars.yml

@@ -12,9 +12,6 @@ sap_vm_provision_iac_platform: "ENTER_STRING_VALUE_HERE"
 # Options: Defined in host_specifications_dictionary.
 sap_vm_provision_host_specification_plan: "ENTER_STRING_VALUE_HERE"
 
-# Root domain for DNS entries (e.g., example.com) (String). Not required for existing_hosts.
-sap_vm_provision_dns_root_domain: "ENTER_STRING_VALUE_HERE"
-
 
 #### Key SAP System variables ####
 sap_system_sid: "B01"  # SAP System ID (SID) (String)
@@ -23,6 +20,11 @@ sap_system_hana_db_instance_nr: "90"  # SAP HANA Database instance number (Strin
 sap_system_nwas_abap_ascs_instance_nr: "00"  # SAP NetWeaver ABAP ASCS instance number (String).
 sap_system_nwas_abap_pas_instance_nr: "01"  # SAP NetWeaver ABAP PAS instance number (String).
 
+## SAP Product selection ##
+# Name of the SAP product to install (String).
+# Options: Defined in sap_software_install_dictionary (e.g. sap_bw4hana_2023_sandbox).
+sap_software_product: "ENTER_STRING_VALUE_HERE"
+
 
 #### SAP Software installation media downloads ####
 ## Required for download using community.sap_launchpad
@@ -113,11 +115,6 @@ sap_domain: "{{ ansible_domain }}"
 sap_ip: "{{ ansible_default_ipv4.address }}"
 
 
-#### SAP Product selection ####
-# Name of the SAP product to install (String).
-# Options: Defined in sap_software_install_dictionary (e.g. sap_bw4hana_2023_sandbox).
-sap_software_product: "ENTER_STRING_VALUE_HERE"
-
 #### Ansible dictionary for SAP Installation Media ####
 sap_software_install_dictionary:
 

deploy_scenarios/sap_bw4hana_sandbox/ansible_playbook.yml

@@ -36,6 +36,21 @@
   gather_facts: false
   tasks:
 
+    - name: Search variables for placeholders
+      ansible.builtin.set_fact:
+        sap_playbook_placeholder_vars: "{{ sap_playbook_placeholder_vars | d([]) + [item.key] }}"
+      loop: "{{ vars | dict2items | selectattr('key', 'match', '^(__)?sap_') | list }}"
+      no_log: true
+      ignore_errors: true
+      when: item.value == 'ENTER_STRING_VALUE_HERE'
+
+    - name: Warning if placeholder variable was found
+      ansible.builtin.fail:
+        msg: |
+          Ensure that the variables do not contain placeholder values before executing playbook again.
+          Variables: {{ sap_playbook_placeholder_vars | join(', ') }}
+      when: sap_playbook_placeholder_vars is defined and sap_playbook_placeholder_vars | length > 0
+
     - name: Set fact with selected host dictionary
       ansible.builtin.set_fact:
         sap_playbook_host_dictionary:

deploy_scenarios/sap_bw4hana_standard_scaleout/ansible_extravars.yml

@@ -12,9 +12,6 @@ sap_vm_provision_iac_platform: "ENTER_STRING_VALUE_HERE"
 # Options: Defined in host_specifications_dictionary.
 sap_vm_provision_host_specification_plan: "ENTER_STRING_VALUE_HERE"
 
-# Root domain for DNS entries (e.g., example.com) (String). Not required for existing_hosts.
-sap_vm_provision_dns_root_domain: "ENTER_STRING_VALUE_HERE"
-
 # SAP HANA Scale-Out variables for role sap_vm_provision
 sap_vm_provision_calculate_sap_hana_scaleout_active_coordinator: 1  # Number of active coordinators (Integer).
 sap_vm_provision_calculate_sap_hana_scaleout_active_worker: 2  # Number of active workers (Integer).
@@ -28,6 +25,11 @@ sap_system_hana_db_instance_nr: "90"  # SAP HANA Database instance number (Strin
 sap_system_nwas_abap_ascs_instance_nr: "00"  # SAP NetWeaver ABAP ASCS instance number (String).
 sap_system_nwas_abap_pas_instance_nr: "01"  # SAP NetWeaver ABAP PAS instance number (String).
 
+## SAP Product selection ##
+# Name of the SAP product to install (String).
+# Options: Defined in sap_software_install_dictionary (e.g. sap_bw4hana_2023_standard).
+sap_software_product: "ENTER_STRING_VALUE_HERE"
+
 
 #### SAP Software installation media downloads ####
 ## Required for download using community.sap_launchpad
@@ -127,11 +129,6 @@ sap_domain: "{{ ansible_domain }}"
 sap_ip: "{{ ansible_default_ipv4.address }}"
 
 
-#### SAP Product selection ####
-# Name of the SAP product to install (String).
-# Options: Defined in sap_software_install_dictionary (e.g. sap_bw4hana_2023_standard).
-sap_software_product: "ENTER_STRING_VALUE_HERE"
-
 #### Ansible dictionary for SAP Installation Media ####
 sap_software_install_dictionary:
 

deploy_scenarios/sap_bw4hana_standard_scaleout/ansible_playbook.yml

@@ -36,6 +36,21 @@
   gather_facts: false
   tasks:
 
+    - name: Search variables for placeholders
+      ansible.builtin.set_fact:
+        sap_playbook_placeholder_vars: "{{ sap_playbook_placeholder_vars | d([]) + [item.key] }}"
+      loop: "{{ vars | dict2items | selectattr('key', 'match', '^(__)?sap_') | list }}"
+      no_log: true
+      ignore_errors: true
+      when: item.value == 'ENTER_STRING_VALUE_HERE'
+
+    - name: Warning if placeholder variable was found
+      ansible.builtin.fail:
+        msg: |
+          Ensure that the variables do not contain placeholder values before executing playbook again.
+          Variables: {{ sap_playbook_placeholder_vars | join(', ') }}
+      when: sap_playbook_placeholder_vars is defined and sap_playbook_placeholder_vars | length > 0
+
     - name: Set fact with selected host dictionary
       ansible.builtin.set_fact:
         sap_playbook_host_dictionary:
@@ -207,7 +222,7 @@
       remote_user: "root"
       ansible.posix.synchronize:
         src: "{{ item }}"
-        dest: "{{ sap_install_media_detect_source_directory }}"
+        dest: "{{ sap_install_media_detect_source_directory | trim | regex_replace('//', '/') | regex_replace(' ', '') | regex_replace('\\/+$', '') + '/' }}"
         mode: "push"
         dest_port: 22
         use_ssh_args: false

deploy_scenarios/sap_ecc_hana_sandbox/ansible_extravars.yml

@@ -12,9 +12,6 @@ sap_vm_provision_iac_platform: "ENTER_STRING_VALUE_HERE"
 # Options: Defined in host_specifications_dictionary.
 sap_vm_provision_host_specification_plan: "ENTER_STRING_VALUE_HERE"
 
-# Root domain for DNS entries (e.g., example.com) (String). Not required for existing_hosts.
-sap_vm_provision_dns_root_domain: "ENTER_STRING_VALUE_HERE"
-
 
 #### Key SAP System variables ####
 sap_system_sid: "E01"  # SAP System ID (SID) (String)
@@ -23,6 +20,11 @@ sap_system_hana_db_instance_nr: "90"  # SAP HANA Database instance number (Strin
 sap_system_nwas_abap_ascs_instance_nr: "00"  # SAP NetWeaver ABAP ASCS instance number (String).
 sap_system_nwas_abap_pas_instance_nr: "01"  # SAP NetWeaver ABAP PAS instance number (String).
 
+## SAP Product selection ##
+# Name of the SAP product to install (String).
+# Options: Defined in sap_software_install_dictionary (e.g. sap_ecc6_ehp8_hana_sandbox).
+sap_software_product: "ENTER_STRING_VALUE_HERE"
+
 
 #### SAP Software installation media downloads ####
 ## Required for download using community.sap_launchpad
@@ -113,11 +115,6 @@ sap_domain: "{{ ansible_domain }}"
 sap_ip: "{{ ansible_default_ipv4.address }}"
 
 
-#### SAP Product selection ####
-# Name of the SAP product to install (String).
-# Options: Defined in sap_software_install_dictionary (e.g. sap_ecc6_ehp8_hana_sandbox).
-sap_software_product: "ENTER_STRING_VALUE_HERE"
-
 #### Ansible dictionary for SAP Installation Media ####
 sap_software_install_dictionary:
 

deploy_scenarios/sap_ecc_hana_sandbox/ansible_playbook.yml

@@ -36,6 +36,21 @@
   gather_facts: false
   tasks:
 
+    - name: Search variables for placeholders
+      ansible.builtin.set_fact:
+        sap_playbook_placeholder_vars: "{{ sap_playbook_placeholder_vars | d([]) + [item.key] }}"
+      loop: "{{ vars | dict2items | selectattr('key', 'match', '^(__)?sap_') | list }}"
+      no_log: true
+      ignore_errors: true
+      when: item.value == 'ENTER_STRING_VALUE_HERE'
+
+    - name: Warning if placeholder variable was found
+      ansible.builtin.fail:
+        msg: |
+          Ensure that the variables do not contain placeholder values before executing playbook again.
+          Variables: {{ sap_playbook_placeholder_vars | join(', ') }}
+      when: sap_playbook_placeholder_vars is defined and sap_playbook_placeholder_vars | length > 0
+
     - name: Set fact with selected host dictionary
       ansible.builtin.set_fact:
         sap_playbook_host_dictionary:

deploy_scenarios/sap_ecc_ibmdb2_distributed/ansible_extravars.yml

@@ -12,9 +12,6 @@ sap_vm_provision_iac_platform: "ENTER_STRING_VALUE_HERE"
 # Options: Defined in host_specifications_dictionary.
 sap_vm_provision_host_specification_plan: "ENTER_STRING_VALUE_HERE"
 
-# Root domain for DNS entries (e.g., example.com) (String). Not required for existing_hosts.
-sap_vm_provision_dns_root_domain: "ENTER_STRING_VALUE_HERE"
-
 
 #### Key SAP System variables ####
 sap_system_sid: "E01"  # SAP System ID (SID) (String)
@@ -23,6 +20,11 @@ sap_system_nwas_abap_ascs_instance_nr: "00"  # SAP NetWeaver ABAP ASCS instance
 sap_system_nwas_abap_pas_instance_nr: "01"  # SAP NetWeaver ABAP PAS instance number (String).
 sap_system_nwas_abap_aas_instance_nr: "11"  # SAP NetWeaver ABAP AAS instance number (String).
 
+## SAP Product selection ##
+# Name of the SAP product to install (String).
+# Options: Defined in sap_software_install_dictionary (e.g. sap_ecc6_ehp8_ibmdb2_distributed).
+sap_software_product: "ENTER_STRING_VALUE_HERE"
+
 
 #### SAP Software installation media downloads ####
 ## Required for download using community.sap_launchpad
@@ -83,11 +85,6 @@ sap_domain: "{{ ansible_domain }}"
 sap_ip: "{{ ansible_default_ipv4.address }}"
 
 
-#### SAP Product selection ####
-# Name of the SAP product to install (String).
-# Options: Defined in sap_software_install_dictionary (e.g. sap_ecc6_ehp8_ibmdb2_distributed).
-sap_software_product: "ENTER_STRING_VALUE_HERE"
-
 #### Ansible dictionary for SAP Installation Media ####
 sap_software_install_dictionary:
 

deploy_scenarios/sap_ecc_ibmdb2_distributed/ansible_playbook.yml

@@ -36,6 +36,21 @@
   gather_facts: false
   tasks:
 
+    - name: Search variables for placeholders
+      ansible.builtin.set_fact:
+        sap_playbook_placeholder_vars: "{{ sap_playbook_placeholder_vars | d([]) + [item.key] }}"
+      loop: "{{ vars | dict2items | selectattr('key', 'match', '^(__)?sap_') | list }}"
+      no_log: true
+      ignore_errors: true
+      when: item.value == 'ENTER_STRING_VALUE_HERE'
+
+    - name: Warning if placeholder variable was found
+      ansible.builtin.fail:
+        msg: |
+          Ensure that the variables do not contain placeholder values before executing playbook again.
+          Variables: {{ sap_playbook_placeholder_vars | join(', ') }}
+      when: sap_playbook_placeholder_vars is defined and sap_playbook_placeholder_vars | length > 0
+
     - name: Set fact with selected host dictionary
       ansible.builtin.set_fact:
         sap_playbook_host_dictionary:
@@ -189,7 +204,7 @@
       remote_user: "root"
       ansible.posix.synchronize:
         src: "{{ sap_install_media_detect_source_directory }}/" # trailing slash to copy items in the directory, not the directory itself
-        dest: "{{ sap_install_media_detect_source_directory }}"
+        dest: "{{ sap_install_media_detect_source_directory | trim | regex_replace('//', '/') | regex_replace(' ', '') | regex_replace('\\/+$', '') + '/' }}"
         mode: "push"
         dest_port: 22
         use_ssh_args: false
@@ -213,7 +228,7 @@
       remote_user: "root"
       ansible.posix.synchronize:
         src: "{{ item }}"
-        dest: "{{ sap_install_media_detect_source_directory }}"
+        dest: "{{ sap_install_media_detect_source_directory | trim | regex_replace('//', '/') | regex_replace(' ', '') | regex_replace('\\/+$', '') + '/' }}"
         mode: "push"
         dest_port: 22
         use_ssh_args: false
@@ -238,7 +253,7 @@
       remote_user: "root"
       ansible.posix.synchronize:
         src: "{{ item }}"
-        dest: "{{ sap_install_media_detect_source_directory }}"
+        dest: "{{ sap_install_media_detect_source_directory | trim | regex_replace('//', '/') | regex_replace(' ', '') | regex_replace('\\/+$', '') + '/' }}"
         mode: "push"
         dest_port: 22
         use_ssh_args: false

deploy_scenarios/sap_ecc_ibmdb2_distributed_ha/ansible_extravars.yml

@@ -12,9 +12,6 @@ sap_vm_provision_iac_platform: "ENTER_STRING_VALUE_HERE"
 # Options: Defined in host_specifications_dictionary.
 sap_vm_provision_host_specification_plan: "ENTER_STRING_VALUE_HERE"
 
-# Root domain for DNS entries (e.g., example.com) (String). Not required for existing_hosts.
-sap_vm_provision_dns_root_domain: "ENTER_STRING_VALUE_HERE"
-
 
 #### Key SAP System variables ####
 sap_system_sid: "E01"  # SAP System ID (SID) (String)
@@ -24,6 +21,11 @@ sap_system_nwas_abap_ers_instance_nr: "10"  # SAP NetWeaver ABAP ERS instance nu
 sap_system_nwas_abap_pas_instance_nr: "01"  # SAP NetWeaver ABAP PAS instance number (String).
 sap_system_nwas_abap_aas_instance_nr: "11"  # SAP NetWeaver ABAP AAS instance number (String).
 
+## SAP Product selection ##
+# Name of the SAP product to install (String).
+# Options: Defined in sap_software_install_dictionary (e.g. sap_ecc6_ehp8_ibmdb2_distributed).
+sap_software_product: "ENTER_STRING_VALUE_HERE"
+
 
 #### SAP Software installation media downloads ####
 ## Required for download using community.sap_launchpad
@@ -124,11 +126,6 @@ sap_domain: "{{ ansible_domain }}"
 sap_ip: "{{ ansible_default_ipv4.address }}"
 
 
-#### SAP Product selection ####
-# Name of the SAP product to install (String).
-# Options: Defined in sap_software_install_dictionary (e.g. sap_ecc6_ehp8_ibmdb2_distributed).
-sap_software_product: "ENTER_STRING_VALUE_HERE"
-
 #### Ansible dictionary for SAP Installation Media ####
 sap_software_install_dictionary: