diff --git a/.github/workflows/ansible_software_availability.yml b/.github/workflows/ansible_software_availability.yml index 2cf093f..19534a1 100644 --- a/.github/workflows/ansible_software_availability.yml +++ b/.github/workflows/ansible_software_availability.yml @@ -29,7 +29,7 @@ jobs: uses: actions/checkout@v4 with: path: gh_repo - - name: Ansible setup + - name: Python setup id: local_setup run: | python --version @@ -110,6 +110,28 @@ jobs: echo " for sublist in query_result:" >> python_module_fuzzy_call_script.py echo " if sublist['Title'].startswith('SYBCTRL'):" >> python_module_fuzzy_call_script.py echo " print(sublist['Title'])" >> python_module_fuzzy_call_script.py + echo " elif any('SAPEXE_' in sublist['Title'] for sublist in query_result):" >> python_module_fuzzy_call_script.py + echo " list_sapexe = []" >> python_module_fuzzy_call_script.py + echo " for sublist in query_result:" >> python_module_fuzzy_call_script.py + echo " if sublist['Title'].startswith('SAPEXE'):" >> python_module_fuzzy_call_script.py + echo " list_sapexe.append(int((sublist['Title'].split('-', 1)[0]).split('_', 1)[1]))" >> python_module_fuzzy_call_script.py + echo " list_sapexe.sort(reverse=True)" >> python_module_fuzzy_call_script.py + echo " print('SAPEXE_' + str(list_sapexe[0]) + '-' + input_search_file + '.SAR')" >> python_module_fuzzy_call_script.py + echo " elif any('SAPEXEDB_' in sublist['Title'] for sublist in query_result):" >> python_module_fuzzy_call_script.py + echo " list_sapexedb = []" >> python_module_fuzzy_call_script.py + echo " for sublist in query_result:" >> python_module_fuzzy_call_script.py + echo " if sublist['Title'].startswith('SAPEXEDB'):" >> python_module_fuzzy_call_script.py + echo " list_sapexedb.append(int((sublist['Title'].split('-', 1)[0]).split('_', 1)[1]))" >> python_module_fuzzy_call_script.py + echo " list_sapexedb.sort(reverse=True)" >> python_module_fuzzy_call_script.py + echo " print('SAPEXEDB_' + str(list_sapexedb[0]) + '-' + input_search_file + '.SAR')" >> python_module_fuzzy_call_script.py + echo " elif any('SMDA' in sublist['Title'] for sublist in query_result):" >> python_module_fuzzy_call_script.py + echo " input_smda = input_search_file_name_and_version_only[:-2]" >> python_module_fuzzy_call_script.py + echo " list_smda = []" >> python_module_fuzzy_call_script.py + echo " for sublist in query_result:" >> python_module_fuzzy_call_script.py + echo " if sublist['Title'].startswith(input_smda):" >> python_module_fuzzy_call_script.py + echo " list_smda.append(sublist['Title'])" >> python_module_fuzzy_call_script.py + echo " list_smda.sort(reverse=True)" >> python_module_fuzzy_call_script.py + echo " print(list_smda[0])" >> python_module_fuzzy_call_script.py echo " elif any('IMDB_CLIENT20' in sublist['Title'] for sublist in query_result):" >> python_module_fuzzy_call_script.py echo " input_imdb_client = input_search_file_name_and_version_only[:-2]" >> python_module_fuzzy_call_script.py echo " list_imdb_client = []" >> python_module_fuzzy_call_script.py diff --git a/deploy_scenarios/sap_bw4hana_sandbox/ansible_extravars.yml b/deploy_scenarios/sap_bw4hana_sandbox/ansible_extravars.yml index 4aaddb8..527c9eb 100755 --- a/deploy_scenarios/sap_bw4hana_sandbox/ansible_extravars.yml +++ b/deploy_scenarios/sap_bw4hana_sandbox/ansible_extravars.yml @@ -191,16 +191,16 @@ sap_swpm_templates_install_dictionary: softwarecenter_search_list_ppc64le: - 'SAPCAR_1115-70006238.EXE' - - 'IMDB_SERVER20_077_0-80002031.SAR' + - 'IMDB_SERVER20_077_0-80002046.SAR' - 'IMDB_LCAPPS_2067P_400-80002183.SAR' - 'IMDB_AFL20_067P_400-80002045.SAR' - - 'IMDB_CLIENT20_021_31-80002082.SAR' # SAP HANA Client - - 'SWPM20SP19_1-80003424.SAR' - - 'igsexe_4-70005417.sar' # IGS 7.81 + - 'IMDB_CLIENT20_021_31-80002095.SAR' # SAP HANA Client + - 'SWPM20SP19_1-80003426.SAR' + - 'igsexe_4-70005446.sar' # IGS 7.81 - 'igshelper_17-10010245.sar' - - 'SAPEXE_51-70007807.SAR' # Kernel Part I (785) - - 'SAPEXEDB_51-70007806.SAR' # Kernel Part II (785), SAP HANA 2.0 - - 'SAPHOSTAGENT62_62-80004822.SAR' # SAP Host Agent 7.22 + - 'SAPEXE_51-70007832.SAR' # Kernel Part I (785) + - 'SAPEXEDB_51-70007831.SAR' # Kernel Part II (785), SAP HANA 2.0 + - 'SAPHOSTAGENT62_62-80004831.SAR' # SAP Host Agent 7.22 - 'BW4HANA400_INST_EXPORT_1.zip' - 'BW4HANA400_INST_EXPORT_2.zip' - 'BW4HANA400_INST_EXPORT_3.zip' @@ -297,27 +297,47 @@ sap_swpm_templates_install_dictionary: sap_vm_provision_aws_ec2_vs_host_os_image_dictionary: rhel-8-1: "*RHEL-8.1*_HVM*x86_64*" - rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" + # rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" # removed rhel-8-4: "*RHEL-8.4*_HVM*x86_64*" rhel-8-6: "*RHEL-8.6*_HVM*x86_64*" rhel-8-8: "*RHEL-8.8*_HVM*x86_64*" + rhel-8-10: "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0: "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1: "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2: "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3: "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4: "*RHEL-9.4*_HVM*x86_64*" + sles-12-5: "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" # removed + # sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" # removed + # sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" # removed + sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6: "*suse-sles-15-sp6-v202*-hvm-ssd-x86_64*" + # rhel-7-7-sap-ha: "*RHEL-SAP-8.1.0*" # removed + # rhel-7-9-sap-ha: "*RHEL-SAP-8.1.0*" # removed rhel-8-1-sap-ha: "*RHEL-SAP-8.1.0*" rhel-8-2-sap-ha: "*RHEL-SAP-8.2.0*" rhel-8-4-sap-ha: "*RHEL-SAP-8.4.0*" rhel-8-6-sap-ha: "*RHEL-SAP-8.6.0*" rhel-8-8-sap-ha: "*RHEL-SAP-8.8.0*" + rhel-8-10-sap-ha: "*RHEL-SAP-8.10.0*" rhel-9-0-sap-ha: "*RHEL-SAP-9.0.0*" rhel-9-2-sap-ha: "*RHEL-SAP-9.2.0*" - sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" - sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" - sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" - sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + rhel-9-4-sap-ha: "*RHEL-SAP-9.4.0*" sles-12-5-sap-ha: "*suse-sles-sap-12-sp5-v202*-hvm-ssd-x86_64*" sles-15-1-sap-ha: "*suse-sles-sap-15-sp1-v202*-hvm-ssd-x86_64*" sles-15-2-sap-ha: "*suse-sles-sap-15-sp2-v202*-hvm-ssd-x86_64*" sles-15-3-sap-ha: "*suse-sles-sap-15-sp3-v202*-hvm-ssd-x86_64*" sles-15-4-sap-ha: "*suse-sles-sap-15-sp4-v202*-hvm-ssd-x86_64*" sles-15-5-sap-ha: "*suse-sles-sap-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha: "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" + sles-15-4-sap-ha-byos: "*suse-sles-sap-15-sp4-byos-v202*-hvm-ssd-x86_64*" + sles-15-5-sap-ha-byos: "*suse-sles-sap-15-sp5-byos-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha-byos: "*suse-sles-sap-15-sp6-byos-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha: "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" + sles-15-4-sap-ha-byos: "*suse-sles-sap-15-sp4-byos-v202*-hvm-ssd-x86_64*" + sles-15-5-sap-ha-byos: "*suse-sles-sap-15-sp5-byos-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha-byos: "*suse-sles-sap-15-sp6-byos-v202*-hvm-ssd-x86_64*" sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: @@ -397,42 +417,75 @@ sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: #### sap_vm_provision_gcp_ce_vm_host_os_image_dictionary: - rhel-8-latest: project: "rhel-cloud" family: "rhel-8" - - rhel-8-1-sap-ha: + rhel-9-latest: + project: "rhel-cloud" + family: "rhel-9" + sles-12-latest: + project: "suse-cloud" + family: "sles-12" + sles-15-latest: + project: "suse-cloud" + family: "sles-15" + # rhel-7-7-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-7-7-sap-ha" + rhel-7-9-sap-ha: project: "rhel-sap-cloud" - family: "rhel-8-1-sap-ha" - + family: "rhel-7-9-sap-ha" + # rhel-8-1-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-8-1-sap-ha" rhel-8-2-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-2-sap-ha" - rhel-8-4-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-4-sap-ha" - rhel-8-6-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-6-sap-ha" - - sles-15-latest: - project: "suse-cloud" - family: "sles-15" - - sles-15-sp3-sap: + sles-12-5-sap-ha: + project: "suse-sap-cloud" + family: "sles-12-sp5-sap" + # sles-15-1-sap-ha: # removed + # project: "suse-sap-cloud" + # family: "sles-15-sp1-sap" + sles-15-2-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp2-sap" + sles-15-3-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp3-sap" - - sles-15-sp4-sap: + sles-15-4-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp4-sap" - - sles-15-sp5-sap: + sles-15-5-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp5-sap" + sles-15-6-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp6-sap" + sles-12-5-sap-ha-byos: + project: "suse-byos-cloud" + family: "sles-12-sp5-sap-byos" + sles-15-2-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp2-sap-byos" + sles-15-3-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp3-sap-byos" + sles-15-4-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp4-sap-byos" + sles-15-5-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp5-sap-byos" + sles-15-6-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp6-sap-byos" sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: @@ -510,16 +563,31 @@ sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: sap_vm_provision_ibmcloud_vs_host_os_image_dictionary: rhel-8-4: ".*redhat.*8-4.*minimal.*amd64.*" rhel-8-6: ".*redhat.*8-6.*minimal.*amd64.*" + rhel-8-8: ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10: ".*redhat.*8-10.*minimal.*amd64.*" rhel-9-0: ".*redhat.*9-0.*minimal.*amd64.*" rhel-9-2: ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4: ".*redhat.*9-4.*minimal.*amd64.*" + sles-15-5: ".*sles.*15-5.*amd64-[0-9]" + sles-15-6: ".*sles.*15-6.*amd64-[0-9]" + # rhel-7-6-sap-ha: ".*redhat.*7-6.*amd64.*hana.*" # retrievable from deprecated list + # rhel-7-9-sap-ha: ".*redhat.*7-9.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-1-sap-ha: ".*redhat.*8-1.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-2-sap-ha: ".*redhat.*8-2.*amd64.*hana.*" # retrievable from deprecated list rhel-8-4-sap-ha: ".*redhat.*8-4.*amd64.*hana.*" rhel-8-6-sap-ha: ".*redhat.*8-6.*amd64.*hana.*" rhel-8-8-sap-ha: ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha: ".*redhat.*8-10.*amd64.*hana.*" rhel-9-0-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" - rhel-9-2-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha: ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha: ".*redhat.*9-4.*amd64.*hana.*" + # sles-12-4-sap-ha: ".*sles.*12-4.*amd64.*hana.*" # retrievable from deprecated list + # sles-12-5-sap-ha: ".*sles.*12-5.*amd64.*hana.*" # retrievable from deprecated list + # sles-15-1-sap-ha: ".*sles.*15-1.*amd64.*hana.*" # retrievable from deprecated list sles-15-3-sap-ha: ".*sles.*15-3.*amd64.*hana.*" sles-15-4-sap-ha: ".*sles.*15-4.*amd64.*hana.*" sles-15-5-sap-ha: ".*sles.*15-5.*amd64.*hana.*" + sles-15-6-sap-ha: ".*sles.*15-6.*amd64.*hana.*" sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: @@ -678,7 +746,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: # See SAP Note 1597355 - Swap-space recommendation for Linux - name: swap # sbx disk_size: 96 - disk_type: tier3 + disk_type: tier1 filesystem_type: swap # must be swap filesystem - name: software @@ -694,96 +762,186 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: #### sap_vm_provision_msazure_vm_host_os_image_dictionary: - + rhel-8-0: + publisher: "RedHat" + offer: "RHEL" + sku: "8-gen2" + rhel-8-1: + publisher: "RedHat" + offer: "RHEL" + sku: "81-gen2" + rhel-8-2: + publisher: "RedHat" + offer: "RHEL" + sku: "82-gen2" + rhel-8-3: + publisher: "RedHat" + offer: "RHEL" + sku: "83-gen2" rhel-8-4: publisher: "RedHat" offer: "RHEL" sku: "84-gen2" - + rhel-8-5: + publisher: "RedHat" + offer: "RHEL" + sku: "85-gen2" + rhel-8-6: + publisher: "RedHat" + offer: "RHEL" + sku: "86-gen2" + rhel-8-7: + publisher: "RedHat" + offer: "RHEL" + sku: "87-gen2" + rhel-8-8: + publisher: "RedHat" + offer: "RHEL" + sku: "88-gen2" + rhel-8-9: + publisher: "RedHat" + offer: "RHEL" + sku: "89-gen2" + rhel-8-10: + publisher: "RedHat" + offer: "RHEL" + sku: "810-gen2" + rhel-9-0: + publisher: "RedHat" + offer: "RHEL" + sku: "90-gen2" + rhel-9-1: + publisher: "RedHat" + offer: "RHEL" + sku: "91-gen2" + rhel-9-2: + publisher: "RedHat" + offer: "RHEL" + sku: "92-gen2" + rhel-9-3: + publisher: "RedHat" + offer: "RHEL" + sku: "93-gen2" + rhel-9-4: + publisher: "RedHat" + offer: "RHEL" + sku: "94-gen2" + sles-12-5: + publisher: "SUSE" + offer: "sles-12-sp5" + sku: "gen2" + sles-15-1: + publisher: "SUSE" + offer: "sles-15-sp1" + sku: "gen2" + sles-15-2: + publisher: "SUSE" + offer: "sles-15-sp2" + sku: "gen2" + sles-15-3: + publisher: "SUSE" + offer: "sles-15-sp3" + sku: "gen2" + sles-15-4: + publisher: "SUSE" + offer: "sles-15-sp4" + sku: "gen2" + sles-15-5: + publisher: "SUSE" + offer: "sles-15-sp5" + sku: "gen2" + sles-15-6: + publisher: "SUSE" + offer: "sles-15-sp6" + sku: "gen2" rhel-8-1-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "81sapha-gen2" - rhel-8-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "82sapha-gen2" - rhel-8-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "84sapha-gen2" - rhel-8-6-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "86sapha-gen2" - rhel-8-8-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "88sapha-gen2" - + rhel-8-10-sap-ha: + publisher: "RedHat" + offer: "RHEL-SAP-HA" + sku: "810sapha-gen2" rhel-9-0-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "90sapha-gen2" - rhel-9-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "92sapha-gen2" - - rhel-8-1-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "81sapapps-gen2" - - rhel-8-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "82sapapps-gen2" - - rhel-8-4-sap-applications: + rhel-9-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" - sku: "84sapapps-gen2" - - rhel-8-6-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "86sapapps-gen2" - - rhel-8-8-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "88sapapps-gen2" - - rhel-9-0-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "90sapapps-gen2" - - rhel-9-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "92sapapps-gen2" - - sles-15-sp3-sap: + sku: "94sapha-gen2" + sles-12-5-sap-ha: + publisher: "SUSE" + offer: "sles-sap-12-sp5" + sku: "gen2" + sles-15-1-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp1" + sku: "gen2" + sles-15-2-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp2" + sku: "gen2" + sles-15-3-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp3" sku: "gen2" - - sles-15-sp4-sap: + sles-15-4-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp4" sku: "gen2" - - sles-15-sp5-sap: + sles-15-5-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp5" sku: "gen2" + sles-15-6-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp6" + sku: "gen2" + sles-15-1-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp1-byos" + sku: "gen2" + sles-15-2-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp2-byos" + sku: "gen2" + sles-15-3-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp3-byos" + sku: "gen2" + sles-15-4-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp4-byos" + sku: "gen2" + sles-15-5-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp5-byos" + sku: "gen2" + sles-15-6-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp6-byos" + sku: "gen2" sap_vm_provision_msazure_vm_host_specifications_dictionary: diff --git a/deploy_scenarios/sap_bw4hana_sandbox/ansible_playbook.yml b/deploy_scenarios/sap_bw4hana_sandbox/ansible_playbook.yml index 983540b..eb1743e 100644 --- a/deploy_scenarios/sap_bw4hana_sandbox/ansible_playbook.yml +++ b/deploy_scenarios/sap_bw4hana_sandbox/ansible_playbook.yml @@ -129,7 +129,6 @@ mode: '0755' loop: - "{{ sap_install_media_detect_source_directory }}" - - "{{ sap_hana_install_software_directory }}" - name: Install Python package manager pip3 to system Python ansible.builtin.package: diff --git a/deploy_scenarios/sap_bw4hana_sandbox/ansible_requirements.yml b/deploy_scenarios/sap_bw4hana_sandbox/ansible_requirements.yml index af7ed22..1454ec5 100644 --- a/deploy_scenarios/sap_bw4hana_sandbox/ansible_requirements.yml +++ b/deploy_scenarios/sap_bw4hana_sandbox/ansible_requirements.yml @@ -8,16 +8,16 @@ collections: version: 6.1.0 - name: fedora.linux_system_roles type: galaxy - version: 1.82.0 + version: 1.88.9 - name: community.sap_install type: galaxy - version: 1.4.0 + version: 1.5.0 - name: community.sap_launchpad type: galaxy - version: 1.1.0 + version: 1.1.1 - name: community.sap_infrastructure type: galaxy - version: 1.0.1 + version: 1.1.0 # - name: community.sap_operations # type: galaxy # version: 0.9.1 @@ -25,23 +25,23 @@ collections: # Collections for Infrastructure from Ansible Galaxy - name: cloud.terraform type: galaxy - version: 1.1.0 + version: 3.0.0 - name: amazon.aws type: galaxy - version: 7.2.0 + version: 9.0.0 - name: community.aws type: galaxy - version: 7.1.0 + version: 9.0.0 - name: azure.azcollection type: galaxy - version: 2.2.0 + version: 3.0.1 - name: google.cloud type: galaxy version: 1.1.3 # Replace with ibm.cloud in future, legacy Ansible Collection uses hidden on-the-fly Terraform files in /var/tmp/ansible/ibmcloud) - name: ibm.cloudcollection type: galaxy - version: 1.51.0 + version: 1.71.2 - name: ovirt.ovirt type: galaxy version: 3.1.2 @@ -53,21 +53,12 @@ collections: version: 3.0.0 - name: cloud.common type: galaxy - version: 3.0.0 + version: 4.0.0 # Collections from public repositories via HTTPS # - name: https://github.com/sap-linuxlab/community.sap_install.git # type: git # version: dev -# - name: https://github.com/sap-linuxlab/community.sap_launchpad.git -# type: git -# version: main -# - name: https://github.com/sap-linuxlab/community.sap_operations.git -# type: git -# version: main -# - name: https://github.com/ansible-collections/cloud.terraform.git -# type: git -# version: main # Collections from private repositories via use SSH (embedded GitHub PAT does not work) # Used for customised/forked Ansible Collections diff --git a/deploy_scenarios/sap_bw4hana_sandbox/optional/ansible_extravars_noninteractive.yml b/deploy_scenarios/sap_bw4hana_sandbox/optional/ansible_extravars_noninteractive.yml index ca15d15..6b11709 100755 --- a/deploy_scenarios/sap_bw4hana_sandbox/optional/ansible_extravars_noninteractive.yml +++ b/deploy_scenarios/sap_bw4hana_sandbox/optional/ansible_extravars_noninteractive.yml @@ -113,13 +113,14 @@ sap_vm_provision_ibmcloud_vpc_sg_names: "ENTER_STRING_VALUE_HERE,ENTER_STRING_VA #### sap_vm_provision_ibmcloud_api_key: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ibmcloud_resource_group_name: "ENTER_STRING_VALUE_HERE" # if ansible_to_terraform, use "new" -sap_vm_provision_ibmcloud_private_dns_instance_name: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_private_dns_instance_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform sap_vm_provision_ibmcloud_powervs_location: "ENTER_STRING_VALUE_HERE" -sap_vm_provision_ibmcloud_powervs_workspace_name: "ENTER_STRING_VALUE_HERE" -sap_vm_provision_ibmcloud_powervs_vlan_subnet_name: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_powervs_workspace_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform +sap_vm_provision_ibmcloud_powervs_vlan_subnet_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform sap_vm_provision_ibmcloud_powervs_host_os_image: "ENTER_STRING_VALUE_HERE" sap_vm_provision_bastion_user: "ENTER_STRING_VALUE_HERE" sap_vm_provision_bastion_ssh_port: "ENTER_STRING_VALUE_HERE" +# sap_vm_provision_ibmcloud_vpc_subnet_name: "ENTER_STRING_VALUE_HERE" # only for ansible_to_terraform, can be name or 'new' # Only for use when 'ansible' is value provided for variable sap_vm_provision_iac_type #### @@ -127,6 +128,7 @@ sap_vm_provision_bastion_public_ip: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ssh_bastion_private_key_file_path: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ssh_host_private_key_file_path: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ibmcloud_powervs_key_pair_name_ssh_host_public_key: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_private_dns_custom_resolver_ip: "ENTER_STRING_VALUE_HERE" # sap_vm_provision_ibmcloud_private_dns_resource_group_name: "" # optional, default use of sap_vm_provision_ibmcloud_resource_group_name sap_vm_provision_proxy_web_forward_proxy_ip: "ENTER_STRING_VALUE_HERE" # IP:Port only, no http:// prefix sap_vm_provision_proxy_web_forward_exclusions: "localhost,127.0.0.1,{{ sap_vm_provision_dns_root_domain }}" @@ -328,7 +330,7 @@ sap_id_user: "ENTER_STRING_VALUE_HERE" sap_id_user_password: 'ENTER_STRING_VALUE_HERE' # Directory for SAP installation media -sap_software_download_directory: "ENTER_STRING_VALUE_HERE" +sap_install_media_detect_source_directory: "ENTER_STRING_VALUE_HERE" # e.g. /software #### diff --git a/deploy_scenarios/sap_bw4hana_standard_scaleout/ansible_extravars.yml b/deploy_scenarios/sap_bw4hana_standard_scaleout/ansible_extravars.yml index c829edb..a332dda 100755 --- a/deploy_scenarios/sap_bw4hana_standard_scaleout/ansible_extravars.yml +++ b/deploy_scenarios/sap_bw4hana_standard_scaleout/ansible_extravars.yml @@ -226,16 +226,16 @@ sap_swpm_templates_install_dictionary: softwarecenter_search_list_ppc64le: - 'SAPCAR_1115-70006238.EXE' - - 'IMDB_SERVER20_077_0-80002031.SAR' + - 'IMDB_SERVER20_077_0-80002046.SAR' - 'IMDB_LCAPPS_2067P_400-80002183.SAR' - 'IMDB_AFL20_067P_400-80002045.SAR' - - 'IMDB_CLIENT20_021_31-80002082.SAR' # SAP HANA Client - - 'SWPM20SP19_1-80003424.SAR' - - 'igsexe_4-70005417.sar' # IGS 7.81 + - 'IMDB_CLIENT20_021_31-80002095.SAR' # SAP HANA Client + - 'SWPM20SP19_1-80003426.SAR' + - 'igsexe_4-70005446.sar' # IGS 7.81 - 'igshelper_17-10010245.sar' - - 'SAPEXE_51-70007807.SAR' # Kernel Part I (785) - - 'SAPEXEDB_51-70007806.SAR' # Kernel Part II (785), SAP HANA 2.0 - - 'SAPHOSTAGENT62_62-80004822.SAR' # SAP Host Agent 7.22 + - 'SAPEXE_51-70007832.SAR' # Kernel Part I (785) + - 'SAPEXEDB_51-70007831.SAR' # Kernel Part II (785), SAP HANA 2.0 + - 'SAPHOSTAGENT62_62-80004831.SAR' # SAP Host Agent 7.22 - 'BW4HANA400_INST_EXPORT_1.zip' - 'BW4HANA400_INST_EXPORT_2.zip' - 'BW4HANA400_INST_EXPORT_3.zip' @@ -333,27 +333,43 @@ sap_swpm_templates_install_dictionary: sap_vm_provision_aws_ec2_vs_host_os_image_dictionary: rhel-8-1: "*RHEL-8.1*_HVM*x86_64*" - rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" + # rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" # removed rhel-8-4: "*RHEL-8.4*_HVM*x86_64*" rhel-8-6: "*RHEL-8.6*_HVM*x86_64*" rhel-8-8: "*RHEL-8.8*_HVM*x86_64*" + rhel-8-10: "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0: "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1: "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2: "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3: "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4: "*RHEL-9.4*_HVM*x86_64*" + sles-12-5: "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" # removed + # sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" # removed + # sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" # removed + sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6: "*suse-sles-15-sp6-v202*-hvm-ssd-x86_64*" + # rhel-7-7-sap-ha: "*RHEL-SAP-8.1.0*" # removed + # rhel-7-9-sap-ha: "*RHEL-SAP-8.1.0*" # removed rhel-8-1-sap-ha: "*RHEL-SAP-8.1.0*" rhel-8-2-sap-ha: "*RHEL-SAP-8.2.0*" rhel-8-4-sap-ha: "*RHEL-SAP-8.4.0*" rhel-8-6-sap-ha: "*RHEL-SAP-8.6.0*" rhel-8-8-sap-ha: "*RHEL-SAP-8.8.0*" + rhel-8-10-sap-ha: "*RHEL-SAP-8.10.0*" rhel-9-0-sap-ha: "*RHEL-SAP-9.0.0*" rhel-9-2-sap-ha: "*RHEL-SAP-9.2.0*" - sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" - sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" - sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" - sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + rhel-9-4-sap-ha: "*RHEL-SAP-9.4.0*" sles-12-5-sap-ha: "*suse-sles-sap-12-sp5-v202*-hvm-ssd-x86_64*" sles-15-1-sap-ha: "*suse-sles-sap-15-sp1-v202*-hvm-ssd-x86_64*" sles-15-2-sap-ha: "*suse-sles-sap-15-sp2-v202*-hvm-ssd-x86_64*" sles-15-3-sap-ha: "*suse-sles-sap-15-sp3-v202*-hvm-ssd-x86_64*" sles-15-4-sap-ha: "*suse-sles-sap-15-sp4-v202*-hvm-ssd-x86_64*" sles-15-5-sap-ha: "*suse-sles-sap-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha: "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" + sles-15-4-sap-ha-byos: "*suse-sles-sap-15-sp4-byos-v202*-hvm-ssd-x86_64*" + sles-15-5-sap-ha-byos: "*suse-sles-sap-15-sp5-byos-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha-byos: "*suse-sles-sap-15-sp6-byos-v202*-hvm-ssd-x86_64*" sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: @@ -448,42 +464,75 @@ sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: #### sap_vm_provision_gcp_ce_vm_host_os_image_dictionary: - rhel-8-latest: project: "rhel-cloud" family: "rhel-8" - - rhel-8-1-sap-ha: + rhel-9-latest: + project: "rhel-cloud" + family: "rhel-9" + sles-12-latest: + project: "suse-cloud" + family: "sles-12" + sles-15-latest: + project: "suse-cloud" + family: "sles-15" + # rhel-7-7-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-7-7-sap-ha" + rhel-7-9-sap-ha: project: "rhel-sap-cloud" - family: "rhel-8-1-sap-ha" - + family: "rhel-7-9-sap-ha" + # rhel-8-1-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-8-1-sap-ha" rhel-8-2-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-2-sap-ha" - rhel-8-4-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-4-sap-ha" - rhel-8-6-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-6-sap-ha" - - sles-15-latest: - project: "suse-cloud" - family: "sles-15" - - sles-15-sp3-sap: + sles-12-5-sap-ha: + project: "suse-sap-cloud" + family: "sles-12-sp5-sap" + # sles-15-1-sap-ha: # removed + # project: "suse-sap-cloud" + # family: "sles-15-sp1-sap" + sles-15-2-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp2-sap" + sles-15-3-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp3-sap" - - sles-15-sp4-sap: + sles-15-4-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp4-sap" - - sles-15-sp5-sap: + sles-15-5-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp5-sap" + sles-15-6-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp6-sap" + sles-12-5-sap-ha-byos: + project: "suse-byos-cloud" + family: "sles-12-sp5-sap-byos" + sles-15-2-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp2-sap-byos" + sles-15-3-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp3-sap-byos" + sles-15-4-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp4-sap-byos" + sles-15-5-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp5-sap-byos" + sles-15-6-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp6-sap-byos" sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: @@ -585,16 +634,31 @@ sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: sap_vm_provision_ibmcloud_vs_host_os_image_dictionary: rhel-8-4: ".*redhat.*8-4.*minimal.*amd64.*" rhel-8-6: ".*redhat.*8-6.*minimal.*amd64.*" + rhel-8-8: ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10: ".*redhat.*8-10.*minimal.*amd64.*" rhel-9-0: ".*redhat.*9-0.*minimal.*amd64.*" rhel-9-2: ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4: ".*redhat.*9-4.*minimal.*amd64.*" + sles-15-5: ".*sles.*15-5.*amd64-[0-9]" + sles-15-6: ".*sles.*15-6.*amd64-[0-9]" + # rhel-7-6-sap-ha: ".*redhat.*7-6.*amd64.*hana.*" # retrievable from deprecated list + # rhel-7-9-sap-ha: ".*redhat.*7-9.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-1-sap-ha: ".*redhat.*8-1.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-2-sap-ha: ".*redhat.*8-2.*amd64.*hana.*" # retrievable from deprecated list rhel-8-4-sap-ha: ".*redhat.*8-4.*amd64.*hana.*" rhel-8-6-sap-ha: ".*redhat.*8-6.*amd64.*hana.*" rhel-8-8-sap-ha: ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha: ".*redhat.*8-10.*amd64.*hana.*" rhel-9-0-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" - rhel-9-2-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha: ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha: ".*redhat.*9-4.*amd64.*hana.*" + # sles-12-4-sap-ha: ".*sles.*12-4.*amd64.*hana.*" # retrievable from deprecated list + # sles-12-5-sap-ha: ".*sles.*12-5.*amd64.*hana.*" # retrievable from deprecated list + # sles-15-1-sap-ha: ".*sles.*15-1.*amd64.*hana.*" # retrievable from deprecated list sles-15-3-sap-ha: ".*sles.*15-3.*amd64.*hana.*" sles-15-4-sap-ha: ".*sles.*15-4.*amd64.*hana.*" sles-15-5-sap-ha: ".*sles.*15-5.*amd64.*hana.*" + sles-15-6-sap-ha: ".*sles.*15-6.*amd64.*hana.*" sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: @@ -695,17 +759,26 @@ sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: # Full Linux subscription ppc64le OS Images with support and activation keys sap_vm_provision_ibmcloud_powervs_host_os_image_dictionary: - rhel-8-4: ".*RHEL.*8.*4" - rhel-8-6: ".*RHEL.*8.*6" + rhel-8-8: ".*RHEL.*8.*8" rhel-9-2: ".*RHEL.*9.*2" - sles-15-3: ".*SLES.*15.*3" - sles-15-4: ".*SLES.*15.*4" + rhel-9-4: ".*RHEL.*9.*4" + sles-15-5: ".*SLES.*15.*5$" + rhel-8-4-sap-ha: "RHEL8-SP4-SAP" rhel-8-6-sap-ha: ".*RHEL.*8.*6.*SAP$" # ensure string suffix using $ rhel-8-8-sap-ha: ".*RHEL.*8.*8.*SAP$" # ensure string suffix using $ rhel-9-2-sap-ha: ".*RHEL.*9.*2.*SAP$" # ensure string suffix using $ sles-15-2-sap-ha: ".*SLES.*15.*2.*SAP$" # ensure string suffix using $ sles-15-3-sap-ha: ".*SLES.*15.*3.*SAP$" # ensure string suffix using $ sles-15-4-sap-ha: ".*SLES.*15.*4.*SAP$" # ensure string suffix using $ + sles-15-5-sap-ha: "SLES15-SP5-SAP" + # rhel-8-4-sap-ha-byol: "RHEL8-SP4-SAP-BYOL" + # rhel-8-6-sap-ha-byol: ".*RHEL.*8.*6.*SAP-BYOL$" # ensure string suffix using $ + # rhel-8-8-sap-ha-byol: ".*RHEL.*8.*8.*SAP-BYOL$" # ensure string suffix using $ + # rhel-9-2-sap-ha-byol: ".*RHEL.*9.*2.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-2-sap-ha-byol: ".*SLES.*15.*2.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-3-sap-ha-byol: ".*SLES.*15.*3.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-4-sap-ha-byol: ".*SLES.*15.*4.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-5-sap-ha-byol: "SLES15-SP5-SAP-BYOL" sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: @@ -751,7 +824,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: - name: swap # hdb swap_path: /swapfile # use swap file on root disk, instead of creating LVM LV for swap disk_size: 2 - disk_type: tier3 + disk_type: tier1 filesystem_type: swap # must be swap filesystem - name: software @@ -807,96 +880,186 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: #### sap_vm_provision_msazure_vm_host_os_image_dictionary: - + rhel-8-0: + publisher: "RedHat" + offer: "RHEL" + sku: "8-gen2" + rhel-8-1: + publisher: "RedHat" + offer: "RHEL" + sku: "81-gen2" + rhel-8-2: + publisher: "RedHat" + offer: "RHEL" + sku: "82-gen2" + rhel-8-3: + publisher: "RedHat" + offer: "RHEL" + sku: "83-gen2" rhel-8-4: publisher: "RedHat" offer: "RHEL" sku: "84-gen2" - + rhel-8-5: + publisher: "RedHat" + offer: "RHEL" + sku: "85-gen2" + rhel-8-6: + publisher: "RedHat" + offer: "RHEL" + sku: "86-gen2" + rhel-8-7: + publisher: "RedHat" + offer: "RHEL" + sku: "87-gen2" + rhel-8-8: + publisher: "RedHat" + offer: "RHEL" + sku: "88-gen2" + rhel-8-9: + publisher: "RedHat" + offer: "RHEL" + sku: "89-gen2" + rhel-8-10: + publisher: "RedHat" + offer: "RHEL" + sku: "810-gen2" + rhel-9-0: + publisher: "RedHat" + offer: "RHEL" + sku: "90-gen2" + rhel-9-1: + publisher: "RedHat" + offer: "RHEL" + sku: "91-gen2" + rhel-9-2: + publisher: "RedHat" + offer: "RHEL" + sku: "92-gen2" + rhel-9-3: + publisher: "RedHat" + offer: "RHEL" + sku: "93-gen2" + rhel-9-4: + publisher: "RedHat" + offer: "RHEL" + sku: "94-gen2" + sles-12-5: + publisher: "SUSE" + offer: "sles-12-sp5" + sku: "gen2" + sles-15-1: + publisher: "SUSE" + offer: "sles-15-sp1" + sku: "gen2" + sles-15-2: + publisher: "SUSE" + offer: "sles-15-sp2" + sku: "gen2" + sles-15-3: + publisher: "SUSE" + offer: "sles-15-sp3" + sku: "gen2" + sles-15-4: + publisher: "SUSE" + offer: "sles-15-sp4" + sku: "gen2" + sles-15-5: + publisher: "SUSE" + offer: "sles-15-sp5" + sku: "gen2" + sles-15-6: + publisher: "SUSE" + offer: "sles-15-sp6" + sku: "gen2" rhel-8-1-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "81sapha-gen2" - rhel-8-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "82sapha-gen2" - rhel-8-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "84sapha-gen2" - rhel-8-6-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "86sapha-gen2" - rhel-8-8-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "88sapha-gen2" - + rhel-8-10-sap-ha: + publisher: "RedHat" + offer: "RHEL-SAP-HA" + sku: "810sapha-gen2" rhel-9-0-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "90sapha-gen2" - rhel-9-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "92sapha-gen2" - - rhel-8-1-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "81sapapps-gen2" - - rhel-8-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "82sapapps-gen2" - - rhel-8-4-sap-applications: + rhel-9-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" - sku: "84sapapps-gen2" - - rhel-8-6-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "86sapapps-gen2" - - rhel-8-8-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "88sapapps-gen2" - - rhel-9-0-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "90sapapps-gen2" - - rhel-9-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "92sapapps-gen2" - - sles-15-sp3-sap: + sku: "94sapha-gen2" + sles-12-5-sap-ha: + publisher: "SUSE" + offer: "sles-sap-12-sp5" + sku: "gen2" + sles-15-1-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp1" + sku: "gen2" + sles-15-2-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp2" + sku: "gen2" + sles-15-3-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp3" sku: "gen2" - - sles-15-sp4-sap: + sles-15-4-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp4" sku: "gen2" - - sles-15-sp5-sap: + sles-15-5-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp5" sku: "gen2" + sles-15-6-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp6" + sku: "gen2" + sles-15-1-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp1-byos" + sku: "gen2" + sles-15-2-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp2-byos" + sku: "gen2" + sles-15-3-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp3-byos" + sku: "gen2" + sles-15-4-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp4-byos" + sku: "gen2" + sles-15-5-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp5-byos" + sku: "gen2" + sles-15-6-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp6-byos" + sku: "gen2" sap_vm_provision_msazure_vm_host_specifications_dictionary: diff --git a/deploy_scenarios/sap_bw4hana_standard_scaleout/ansible_playbook.yml b/deploy_scenarios/sap_bw4hana_standard_scaleout/ansible_playbook.yml index 8340848..dab418c 100644 --- a/deploy_scenarios/sap_bw4hana_standard_scaleout/ansible_playbook.yml +++ b/deploy_scenarios/sap_bw4hana_standard_scaleout/ansible_playbook.yml @@ -184,7 +184,6 @@ mode: '0755' loop: - "{{ sap_install_media_detect_source_directory }}" - - "{{ sap_hana_install_software_directory }}" - name: Install Python package manager pip3 to system Python ansible.builtin.package: @@ -431,12 +430,12 @@ ansible.builtin.set_fact: sap_hana_install_addhosts: | {%- if sap_vm_provision_calculate_sap_hana_scaleout_standby > 0 -%} - {%- for host in (groups['hana_primary'] | reject('search', '0') | list)[:-1] -%} + {%- for host in (groups['hana_primary'] | reject('regex', '0$') | list)[:-1] -%} {{ hostvars[host]['inventory_hostname_short'] }}:role=worker:workergroup={{ sap_hana_install_workergroup }}:group={{ sap_hana_install_group }}, {%- endfor -%} {{ hostvars[(groups['hana_primary'][-1])]['inventory_hostname_short'] }}:role=standby:workergroup={{ sap_hana_install_workergroup }}:group={{ sap_hana_install_group }} {%- elif sap_vm_provision_calculate_sap_hana_scaleout_standby == 0 -%} - {%- for host in (groups['hana_primary'] | reject('search', '0') | list) -%} + {%- for host in (groups['hana_primary'] | reject('regex', '0$') | list) -%} {{ hostvars[host]['inventory_hostname_short'] }}:role=worker:workergroup={{ sap_hana_install_workergroup }}:group={{ sap_hana_install_group }} {%- endfor -%} {%- endif -%} diff --git a/deploy_scenarios/sap_bw4hana_standard_scaleout/ansible_requirements.yml b/deploy_scenarios/sap_bw4hana_standard_scaleout/ansible_requirements.yml index af7ed22..1454ec5 100644 --- a/deploy_scenarios/sap_bw4hana_standard_scaleout/ansible_requirements.yml +++ b/deploy_scenarios/sap_bw4hana_standard_scaleout/ansible_requirements.yml @@ -8,16 +8,16 @@ collections: version: 6.1.0 - name: fedora.linux_system_roles type: galaxy - version: 1.82.0 + version: 1.88.9 - name: community.sap_install type: galaxy - version: 1.4.0 + version: 1.5.0 - name: community.sap_launchpad type: galaxy - version: 1.1.0 + version: 1.1.1 - name: community.sap_infrastructure type: galaxy - version: 1.0.1 + version: 1.1.0 # - name: community.sap_operations # type: galaxy # version: 0.9.1 @@ -25,23 +25,23 @@ collections: # Collections for Infrastructure from Ansible Galaxy - name: cloud.terraform type: galaxy - version: 1.1.0 + version: 3.0.0 - name: amazon.aws type: galaxy - version: 7.2.0 + version: 9.0.0 - name: community.aws type: galaxy - version: 7.1.0 + version: 9.0.0 - name: azure.azcollection type: galaxy - version: 2.2.0 + version: 3.0.1 - name: google.cloud type: galaxy version: 1.1.3 # Replace with ibm.cloud in future, legacy Ansible Collection uses hidden on-the-fly Terraform files in /var/tmp/ansible/ibmcloud) - name: ibm.cloudcollection type: galaxy - version: 1.51.0 + version: 1.71.2 - name: ovirt.ovirt type: galaxy version: 3.1.2 @@ -53,21 +53,12 @@ collections: version: 3.0.0 - name: cloud.common type: galaxy - version: 3.0.0 + version: 4.0.0 # Collections from public repositories via HTTPS # - name: https://github.com/sap-linuxlab/community.sap_install.git # type: git # version: dev -# - name: https://github.com/sap-linuxlab/community.sap_launchpad.git -# type: git -# version: main -# - name: https://github.com/sap-linuxlab/community.sap_operations.git -# type: git -# version: main -# - name: https://github.com/ansible-collections/cloud.terraform.git -# type: git -# version: main # Collections from private repositories via use SSH (embedded GitHub PAT does not work) # Used for customised/forked Ansible Collections diff --git a/deploy_scenarios/sap_bw4hana_standard_scaleout/optional/ansible_extravars_noninteractive.yml b/deploy_scenarios/sap_bw4hana_standard_scaleout/optional/ansible_extravars_noninteractive.yml index 2dd06fb..c8e801a 100755 --- a/deploy_scenarios/sap_bw4hana_standard_scaleout/optional/ansible_extravars_noninteractive.yml +++ b/deploy_scenarios/sap_bw4hana_standard_scaleout/optional/ansible_extravars_noninteractive.yml @@ -123,13 +123,14 @@ sap_vm_provision_ibmcloud_vpc_sg_names: "ENTER_STRING_VALUE_HERE,ENTER_STRING_VA #### sap_vm_provision_ibmcloud_api_key: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ibmcloud_resource_group_name: "ENTER_STRING_VALUE_HERE" # if ansible_to_terraform, use "new" -sap_vm_provision_ibmcloud_private_dns_instance_name: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_private_dns_instance_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform sap_vm_provision_ibmcloud_powervs_location: "ENTER_STRING_VALUE_HERE" -sap_vm_provision_ibmcloud_powervs_workspace_name: "ENTER_STRING_VALUE_HERE" -sap_vm_provision_ibmcloud_powervs_vlan_subnet_name: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_powervs_workspace_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform +sap_vm_provision_ibmcloud_powervs_vlan_subnet_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform sap_vm_provision_ibmcloud_powervs_host_os_image: "ENTER_STRING_VALUE_HERE" sap_vm_provision_bastion_user: "ENTER_STRING_VALUE_HERE" sap_vm_provision_bastion_ssh_port: "ENTER_STRING_VALUE_HERE" +# sap_vm_provision_ibmcloud_vpc_subnet_name: "ENTER_STRING_VALUE_HERE" # only for ansible_to_terraform, can be name or 'new' # Only for use when 'ansible' is value provided for variable sap_vm_provision_iac_type #### @@ -137,6 +138,7 @@ sap_vm_provision_bastion_public_ip: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ssh_bastion_private_key_file_path: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ssh_host_private_key_file_path: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ibmcloud_powervs_key_pair_name_ssh_host_public_key: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_private_dns_custom_resolver_ip: "ENTER_STRING_VALUE_HERE" # sap_vm_provision_ibmcloud_private_dns_resource_group_name: "" # optional, default use of sap_vm_provision_ibmcloud_resource_group_name sap_vm_provision_proxy_web_forward_proxy_ip: "ENTER_STRING_VALUE_HERE" # IP:Port only, no http:// prefix sap_vm_provision_proxy_web_forward_exclusions: "localhost,127.0.0.1,{{ sap_vm_provision_dns_root_domain }}" @@ -351,7 +353,7 @@ sap_id_user: "ENTER_STRING_VALUE_HERE" sap_id_user_password: 'ENTER_STRING_VALUE_HERE' # Directory for SAP installation media -sap_software_download_directory: "ENTER_STRING_VALUE_HERE" +sap_install_media_detect_source_directory: "ENTER_STRING_VALUE_HERE" # e.g. /software #### diff --git a/deploy_scenarios/sap_ecc_hana_sandbox/ansible_extravars.yml b/deploy_scenarios/sap_ecc_hana_sandbox/ansible_extravars.yml index 1855552..c4e5fef 100755 --- a/deploy_scenarios/sap_ecc_hana_sandbox/ansible_extravars.yml +++ b/deploy_scenarios/sap_ecc_hana_sandbox/ansible_extravars.yml @@ -330,27 +330,43 @@ sap_swpm_templates_install_dictionary: sap_vm_provision_aws_ec2_vs_host_os_image_dictionary: rhel-8-1: "*RHEL-8.1*_HVM*x86_64*" - rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" + # rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" # removed rhel-8-4: "*RHEL-8.4*_HVM*x86_64*" rhel-8-6: "*RHEL-8.6*_HVM*x86_64*" rhel-8-8: "*RHEL-8.8*_HVM*x86_64*" + rhel-8-10: "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0: "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1: "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2: "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3: "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4: "*RHEL-9.4*_HVM*x86_64*" + sles-12-5: "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" # removed + # sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" # removed + # sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" # removed + sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6: "*suse-sles-15-sp6-v202*-hvm-ssd-x86_64*" + # rhel-7-7-sap-ha: "*RHEL-SAP-8.1.0*" # removed + # rhel-7-9-sap-ha: "*RHEL-SAP-8.1.0*" # removed rhel-8-1-sap-ha: "*RHEL-SAP-8.1.0*" rhel-8-2-sap-ha: "*RHEL-SAP-8.2.0*" rhel-8-4-sap-ha: "*RHEL-SAP-8.4.0*" rhel-8-6-sap-ha: "*RHEL-SAP-8.6.0*" rhel-8-8-sap-ha: "*RHEL-SAP-8.8.0*" + rhel-8-10-sap-ha: "*RHEL-SAP-8.10.0*" rhel-9-0-sap-ha: "*RHEL-SAP-9.0.0*" rhel-9-2-sap-ha: "*RHEL-SAP-9.2.0*" - sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" - sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" - sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" - sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + rhel-9-4-sap-ha: "*RHEL-SAP-9.4.0*" sles-12-5-sap-ha: "*suse-sles-sap-12-sp5-v202*-hvm-ssd-x86_64*" sles-15-1-sap-ha: "*suse-sles-sap-15-sp1-v202*-hvm-ssd-x86_64*" sles-15-2-sap-ha: "*suse-sles-sap-15-sp2-v202*-hvm-ssd-x86_64*" sles-15-3-sap-ha: "*suse-sles-sap-15-sp3-v202*-hvm-ssd-x86_64*" sles-15-4-sap-ha: "*suse-sles-sap-15-sp4-v202*-hvm-ssd-x86_64*" sles-15-5-sap-ha: "*suse-sles-sap-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha: "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" + sles-15-4-sap-ha-byos: "*suse-sles-sap-15-sp4-byos-v202*-hvm-ssd-x86_64*" + sles-15-5-sap-ha-byos: "*suse-sles-sap-15-sp5-byos-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha-byos: "*suse-sles-sap-15-sp6-byos-v202*-hvm-ssd-x86_64*" sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: @@ -430,42 +446,75 @@ sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: #### sap_vm_provision_gcp_ce_vm_host_os_image_dictionary: - rhel-8-latest: project: "rhel-cloud" family: "rhel-8" - - rhel-8-1-sap-ha: + rhel-9-latest: + project: "rhel-cloud" + family: "rhel-9" + sles-12-latest: + project: "suse-cloud" + family: "sles-12" + sles-15-latest: + project: "suse-cloud" + family: "sles-15" + # rhel-7-7-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-7-7-sap-ha" + rhel-7-9-sap-ha: project: "rhel-sap-cloud" - family: "rhel-8-1-sap-ha" - + family: "rhel-7-9-sap-ha" + # rhel-8-1-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-8-1-sap-ha" rhel-8-2-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-2-sap-ha" - rhel-8-4-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-4-sap-ha" - rhel-8-6-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-6-sap-ha" - - sles-15-latest: - project: "suse-cloud" - family: "sles-15" - - sles-15-sp3-sap: + sles-12-5-sap-ha: + project: "suse-sap-cloud" + family: "sles-12-sp5-sap" + # sles-15-1-sap-ha: # removed + # project: "suse-sap-cloud" + # family: "sles-15-sp1-sap" + sles-15-2-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp2-sap" + sles-15-3-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp3-sap" - - sles-15-sp4-sap: + sles-15-4-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp4-sap" - - sles-15-sp5-sap: + sles-15-5-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp5-sap" + sles-15-6-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp6-sap" + sles-12-5-sap-ha-byos: + project: "suse-byos-cloud" + family: "sles-12-sp5-sap-byos" + sles-15-2-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp2-sap-byos" + sles-15-3-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp3-sap-byos" + sles-15-4-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp4-sap-byos" + sles-15-5-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp5-sap-byos" + sles-15-6-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp6-sap-byos" sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: @@ -543,16 +592,31 @@ sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: sap_vm_provision_ibmcloud_vs_host_os_image_dictionary: rhel-8-4: ".*redhat.*8-4.*minimal.*amd64.*" rhel-8-6: ".*redhat.*8-6.*minimal.*amd64.*" + rhel-8-8: ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10: ".*redhat.*8-10.*minimal.*amd64.*" rhel-9-0: ".*redhat.*9-0.*minimal.*amd64.*" rhel-9-2: ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4: ".*redhat.*9-4.*minimal.*amd64.*" + sles-15-5: ".*sles.*15-5.*amd64-[0-9]" + sles-15-6: ".*sles.*15-6.*amd64-[0-9]" + # rhel-7-6-sap-ha: ".*redhat.*7-6.*amd64.*hana.*" # retrievable from deprecated list + # rhel-7-9-sap-ha: ".*redhat.*7-9.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-1-sap-ha: ".*redhat.*8-1.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-2-sap-ha: ".*redhat.*8-2.*amd64.*hana.*" # retrievable from deprecated list rhel-8-4-sap-ha: ".*redhat.*8-4.*amd64.*hana.*" rhel-8-6-sap-ha: ".*redhat.*8-6.*amd64.*hana.*" rhel-8-8-sap-ha: ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha: ".*redhat.*8-10.*amd64.*hana.*" rhel-9-0-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" - rhel-9-2-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha: ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha: ".*redhat.*9-4.*amd64.*hana.*" + # sles-12-4-sap-ha: ".*sles.*12-4.*amd64.*hana.*" # retrievable from deprecated list + # sles-12-5-sap-ha: ".*sles.*12-5.*amd64.*hana.*" # retrievable from deprecated list + # sles-15-1-sap-ha: ".*sles.*15-1.*amd64.*hana.*" # retrievable from deprecated list sles-15-3-sap-ha: ".*sles.*15-3.*amd64.*hana.*" sles-15-4-sap-ha: ".*sles.*15-4.*amd64.*hana.*" sles-15-5-sap-ha: ".*sles.*15-5.*amd64.*hana.*" + sles-15-6-sap-ha: ".*sles.*15-6.*amd64.*hana.*" sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: @@ -641,17 +705,26 @@ sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: # Full Linux subscription ppc64le OS Images with support and activation keys sap_vm_provision_ibmcloud_powervs_host_os_image_dictionary: - rhel-8-4: ".*RHEL.*8.*4" - rhel-8-6: ".*RHEL.*8.*6" + rhel-8-8: ".*RHEL.*8.*8" rhel-9-2: ".*RHEL.*9.*2" - sles-15-3: ".*SLES.*15.*3" - sles-15-4: ".*SLES.*15.*4" + rhel-9-4: ".*RHEL.*9.*4" + sles-15-5: ".*SLES.*15.*5$" + rhel-8-4-sap-ha: "RHEL8-SP4-SAP" rhel-8-6-sap-ha: ".*RHEL.*8.*6.*SAP$" # ensure string suffix using $ rhel-8-8-sap-ha: ".*RHEL.*8.*8.*SAP$" # ensure string suffix using $ rhel-9-2-sap-ha: ".*RHEL.*9.*2.*SAP$" # ensure string suffix using $ sles-15-2-sap-ha: ".*SLES.*15.*2.*SAP$" # ensure string suffix using $ sles-15-3-sap-ha: ".*SLES.*15.*3.*SAP$" # ensure string suffix using $ sles-15-4-sap-ha: ".*SLES.*15.*4.*SAP$" # ensure string suffix using $ + sles-15-5-sap-ha: "SLES15-SP5-SAP" + # rhel-8-4-sap-ha-byol: "RHEL8-SP4-SAP-BYOL" + # rhel-8-6-sap-ha-byol: ".*RHEL.*8.*6.*SAP-BYOL$" # ensure string suffix using $ + # rhel-8-8-sap-ha-byol: ".*RHEL.*8.*8.*SAP-BYOL$" # ensure string suffix using $ + # rhel-9-2-sap-ha-byol: ".*RHEL.*9.*2.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-2-sap-ha-byol: ".*SLES.*15.*2.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-3-sap-ha-byol: ".*SLES.*15.*3.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-4-sap-ha-byol: ".*SLES.*15.*4.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-5-sap-ha-byol: "SLES15-SP5-SAP-BYOL" sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: @@ -711,7 +784,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: # See SAP Note 1597355 - Swap-space recommendation for Linux - name: swap # sbx disk_size: 96 - disk_type: tier3 + disk_type: tier1 filesystem_type: swap # must be swap filesystem - name: software @@ -727,96 +800,186 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: #### sap_vm_provision_msazure_vm_host_os_image_dictionary: - + rhel-8-0: + publisher: "RedHat" + offer: "RHEL" + sku: "8-gen2" + rhel-8-1: + publisher: "RedHat" + offer: "RHEL" + sku: "81-gen2" + rhel-8-2: + publisher: "RedHat" + offer: "RHEL" + sku: "82-gen2" + rhel-8-3: + publisher: "RedHat" + offer: "RHEL" + sku: "83-gen2" rhel-8-4: publisher: "RedHat" offer: "RHEL" sku: "84-gen2" - + rhel-8-5: + publisher: "RedHat" + offer: "RHEL" + sku: "85-gen2" + rhel-8-6: + publisher: "RedHat" + offer: "RHEL" + sku: "86-gen2" + rhel-8-7: + publisher: "RedHat" + offer: "RHEL" + sku: "87-gen2" + rhel-8-8: + publisher: "RedHat" + offer: "RHEL" + sku: "88-gen2" + rhel-8-9: + publisher: "RedHat" + offer: "RHEL" + sku: "89-gen2" + rhel-8-10: + publisher: "RedHat" + offer: "RHEL" + sku: "810-gen2" + rhel-9-0: + publisher: "RedHat" + offer: "RHEL" + sku: "90-gen2" + rhel-9-1: + publisher: "RedHat" + offer: "RHEL" + sku: "91-gen2" + rhel-9-2: + publisher: "RedHat" + offer: "RHEL" + sku: "92-gen2" + rhel-9-3: + publisher: "RedHat" + offer: "RHEL" + sku: "93-gen2" + rhel-9-4: + publisher: "RedHat" + offer: "RHEL" + sku: "94-gen2" + sles-12-5: + publisher: "SUSE" + offer: "sles-12-sp5" + sku: "gen2" + sles-15-1: + publisher: "SUSE" + offer: "sles-15-sp1" + sku: "gen2" + sles-15-2: + publisher: "SUSE" + offer: "sles-15-sp2" + sku: "gen2" + sles-15-3: + publisher: "SUSE" + offer: "sles-15-sp3" + sku: "gen2" + sles-15-4: + publisher: "SUSE" + offer: "sles-15-sp4" + sku: "gen2" + sles-15-5: + publisher: "SUSE" + offer: "sles-15-sp5" + sku: "gen2" + sles-15-6: + publisher: "SUSE" + offer: "sles-15-sp6" + sku: "gen2" rhel-8-1-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "81sapha-gen2" - rhel-8-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "82sapha-gen2" - rhel-8-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "84sapha-gen2" - rhel-8-6-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "86sapha-gen2" - rhel-8-8-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "88sapha-gen2" - + rhel-8-10-sap-ha: + publisher: "RedHat" + offer: "RHEL-SAP-HA" + sku: "810sapha-gen2" rhel-9-0-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "90sapha-gen2" - rhel-9-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "92sapha-gen2" - - rhel-8-1-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "81sapapps-gen2" - - rhel-8-2-sap-applications: + rhel-9-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" - sku: "82sapapps-gen2" - - rhel-8-4-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "84sapapps-gen2" - - rhel-8-6-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "86sapapps-gen2" - - rhel-8-8-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "88sapapps-gen2" - - rhel-9-0-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "90sapapps-gen2" - - rhel-9-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "92sapapps-gen2" - - sles-15-sp3-sap: + sku: "94sapha-gen2" + sles-12-5-sap-ha: + publisher: "SUSE" + offer: "sles-sap-12-sp5" + sku: "gen2" + sles-15-1-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp1" + sku: "gen2" + sles-15-2-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp2" + sku: "gen2" + sles-15-3-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp3" sku: "gen2" - - sles-15-sp4-sap: + sles-15-4-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp4" sku: "gen2" - - sles-15-sp5-sap: + sles-15-5-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp5" sku: "gen2" + sles-15-6-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp6" + sku: "gen2" + sles-15-1-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp1-byos" + sku: "gen2" + sles-15-2-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp2-byos" + sku: "gen2" + sles-15-3-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp3-byos" + sku: "gen2" + sles-15-4-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp4-byos" + sku: "gen2" + sles-15-5-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp5-byos" + sku: "gen2" + sles-15-6-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp6-byos" + sku: "gen2" sap_vm_provision_msazure_vm_host_specifications_dictionary: diff --git a/deploy_scenarios/sap_ecc_hana_sandbox/ansible_playbook.yml b/deploy_scenarios/sap_ecc_hana_sandbox/ansible_playbook.yml index b81f6ac..e1e6ad5 100644 --- a/deploy_scenarios/sap_ecc_hana_sandbox/ansible_playbook.yml +++ b/deploy_scenarios/sap_ecc_hana_sandbox/ansible_playbook.yml @@ -129,7 +129,6 @@ mode: '0755' loop: - "{{ sap_install_media_detect_source_directory }}" - - "{{ sap_hana_install_software_directory }}" - name: Install Python package manager pip3 to system Python ansible.builtin.package: diff --git a/deploy_scenarios/sap_ecc_hana_sandbox/ansible_requirements.yml b/deploy_scenarios/sap_ecc_hana_sandbox/ansible_requirements.yml index af7ed22..1454ec5 100644 --- a/deploy_scenarios/sap_ecc_hana_sandbox/ansible_requirements.yml +++ b/deploy_scenarios/sap_ecc_hana_sandbox/ansible_requirements.yml @@ -8,16 +8,16 @@ collections: version: 6.1.0 - name: fedora.linux_system_roles type: galaxy - version: 1.82.0 + version: 1.88.9 - name: community.sap_install type: galaxy - version: 1.4.0 + version: 1.5.0 - name: community.sap_launchpad type: galaxy - version: 1.1.0 + version: 1.1.1 - name: community.sap_infrastructure type: galaxy - version: 1.0.1 + version: 1.1.0 # - name: community.sap_operations # type: galaxy # version: 0.9.1 @@ -25,23 +25,23 @@ collections: # Collections for Infrastructure from Ansible Galaxy - name: cloud.terraform type: galaxy - version: 1.1.0 + version: 3.0.0 - name: amazon.aws type: galaxy - version: 7.2.0 + version: 9.0.0 - name: community.aws type: galaxy - version: 7.1.0 + version: 9.0.0 - name: azure.azcollection type: galaxy - version: 2.2.0 + version: 3.0.1 - name: google.cloud type: galaxy version: 1.1.3 # Replace with ibm.cloud in future, legacy Ansible Collection uses hidden on-the-fly Terraform files in /var/tmp/ansible/ibmcloud) - name: ibm.cloudcollection type: galaxy - version: 1.51.0 + version: 1.71.2 - name: ovirt.ovirt type: galaxy version: 3.1.2 @@ -53,21 +53,12 @@ collections: version: 3.0.0 - name: cloud.common type: galaxy - version: 3.0.0 + version: 4.0.0 # Collections from public repositories via HTTPS # - name: https://github.com/sap-linuxlab/community.sap_install.git # type: git # version: dev -# - name: https://github.com/sap-linuxlab/community.sap_launchpad.git -# type: git -# version: main -# - name: https://github.com/sap-linuxlab/community.sap_operations.git -# type: git -# version: main -# - name: https://github.com/ansible-collections/cloud.terraform.git -# type: git -# version: main # Collections from private repositories via use SSH (embedded GitHub PAT does not work) # Used for customised/forked Ansible Collections diff --git a/deploy_scenarios/sap_ecc_hana_sandbox/optional/ansible_extravars_noninteractive.yml b/deploy_scenarios/sap_ecc_hana_sandbox/optional/ansible_extravars_noninteractive.yml index d2bb25e..c2ab8a9 100755 --- a/deploy_scenarios/sap_ecc_hana_sandbox/optional/ansible_extravars_noninteractive.yml +++ b/deploy_scenarios/sap_ecc_hana_sandbox/optional/ansible_extravars_noninteractive.yml @@ -113,13 +113,14 @@ sap_vm_provision_ibmcloud_vpc_sg_names: "ENTER_STRING_VALUE_HERE,ENTER_STRING_VA #### sap_vm_provision_ibmcloud_api_key: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ibmcloud_resource_group_name: "ENTER_STRING_VALUE_HERE" # if ansible_to_terraform, use "new" -sap_vm_provision_ibmcloud_private_dns_instance_name: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_private_dns_instance_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform sap_vm_provision_ibmcloud_powervs_location: "ENTER_STRING_VALUE_HERE" -sap_vm_provision_ibmcloud_powervs_workspace_name: "ENTER_STRING_VALUE_HERE" -sap_vm_provision_ibmcloud_powervs_vlan_subnet_name: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_powervs_workspace_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform +sap_vm_provision_ibmcloud_powervs_vlan_subnet_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform sap_vm_provision_ibmcloud_powervs_host_os_image: "ENTER_STRING_VALUE_HERE" sap_vm_provision_bastion_user: "ENTER_STRING_VALUE_HERE" sap_vm_provision_bastion_ssh_port: "ENTER_STRING_VALUE_HERE" +# sap_vm_provision_ibmcloud_vpc_subnet_name: "ENTER_STRING_VALUE_HERE" # only for ansible_to_terraform, can be name or 'new' # Only for use when 'ansible' is value provided for variable sap_vm_provision_iac_type #### @@ -127,6 +128,7 @@ sap_vm_provision_bastion_public_ip: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ssh_bastion_private_key_file_path: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ssh_host_private_key_file_path: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ibmcloud_powervs_key_pair_name_ssh_host_public_key: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_private_dns_custom_resolver_ip: "ENTER_STRING_VALUE_HERE" # sap_vm_provision_ibmcloud_private_dns_resource_group_name: "" # optional, default use of sap_vm_provision_ibmcloud_resource_group_name sap_vm_provision_proxy_web_forward_proxy_ip: "ENTER_STRING_VALUE_HERE" # IP:Port only, no http:// prefix sap_vm_provision_proxy_web_forward_exclusions: "localhost,127.0.0.1,{{ sap_vm_provision_dns_root_domain }}" @@ -328,7 +330,7 @@ sap_id_user: "ENTER_STRING_VALUE_HERE" sap_id_user_password: 'ENTER_STRING_VALUE_HERE' # Directory for SAP installation media -sap_software_download_directory: "ENTER_STRING_VALUE_HERE" +sap_install_media_detect_source_directory: "ENTER_STRING_VALUE_HERE" # e.g. /software #### diff --git a/deploy_scenarios/sap_ecc_ibmdb2_distributed/ansible_extravars.yml b/deploy_scenarios/sap_ecc_ibmdb2_distributed/ansible_extravars.yml index 33f7893..11a04b6 100755 --- a/deploy_scenarios/sap_ecc_ibmdb2_distributed/ansible_extravars.yml +++ b/deploy_scenarios/sap_ecc_ibmdb2_distributed/ansible_extravars.yml @@ -296,27 +296,43 @@ sap_swpm_templates_install_dictionary: sap_vm_provision_aws_ec2_vs_host_os_image_dictionary: rhel-8-1: "*RHEL-8.1*_HVM*x86_64*" - rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" + # rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" # removed rhel-8-4: "*RHEL-8.4*_HVM*x86_64*" rhel-8-6: "*RHEL-8.6*_HVM*x86_64*" rhel-8-8: "*RHEL-8.8*_HVM*x86_64*" + rhel-8-10: "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0: "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1: "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2: "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3: "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4: "*RHEL-9.4*_HVM*x86_64*" + sles-12-5: "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" # removed + # sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" # removed + # sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" # removed + sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6: "*suse-sles-15-sp6-v202*-hvm-ssd-x86_64*" + # rhel-7-7-sap-ha: "*RHEL-SAP-8.1.0*" # removed + # rhel-7-9-sap-ha: "*RHEL-SAP-8.1.0*" # removed rhel-8-1-sap-ha: "*RHEL-SAP-8.1.0*" rhel-8-2-sap-ha: "*RHEL-SAP-8.2.0*" rhel-8-4-sap-ha: "*RHEL-SAP-8.4.0*" rhel-8-6-sap-ha: "*RHEL-SAP-8.6.0*" rhel-8-8-sap-ha: "*RHEL-SAP-8.8.0*" + rhel-8-10-sap-ha: "*RHEL-SAP-8.10.0*" rhel-9-0-sap-ha: "*RHEL-SAP-9.0.0*" rhel-9-2-sap-ha: "*RHEL-SAP-9.2.0*" - sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" - sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" - sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" - sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + rhel-9-4-sap-ha: "*RHEL-SAP-9.4.0*" sles-12-5-sap-ha: "*suse-sles-sap-12-sp5-v202*-hvm-ssd-x86_64*" sles-15-1-sap-ha: "*suse-sles-sap-15-sp1-v202*-hvm-ssd-x86_64*" sles-15-2-sap-ha: "*suse-sles-sap-15-sp2-v202*-hvm-ssd-x86_64*" sles-15-3-sap-ha: "*suse-sles-sap-15-sp3-v202*-hvm-ssd-x86_64*" sles-15-4-sap-ha: "*suse-sles-sap-15-sp4-v202*-hvm-ssd-x86_64*" sles-15-5-sap-ha: "*suse-sles-sap-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha: "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" + sles-15-4-sap-ha-byos: "*suse-sles-sap-15-sp4-byos-v202*-hvm-ssd-x86_64*" + sles-15-5-sap-ha-byos: "*suse-sles-sap-15-sp5-byos-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha-byos: "*suse-sles-sap-15-sp6-byos-v202*-hvm-ssd-x86_64*" sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: @@ -524,42 +540,75 @@ sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: #### sap_vm_provision_gcp_ce_vm_host_os_image_dictionary: - rhel-8-latest: project: "rhel-cloud" family: "rhel-8" - - rhel-8-1-sap-ha: + rhel-9-latest: + project: "rhel-cloud" + family: "rhel-9" + sles-12-latest: + project: "suse-cloud" + family: "sles-12" + sles-15-latest: + project: "suse-cloud" + family: "sles-15" + # rhel-7-7-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-7-7-sap-ha" + rhel-7-9-sap-ha: project: "rhel-sap-cloud" - family: "rhel-8-1-sap-ha" - + family: "rhel-7-9-sap-ha" + # rhel-8-1-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-8-1-sap-ha" rhel-8-2-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-2-sap-ha" - rhel-8-4-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-4-sap-ha" - rhel-8-6-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-6-sap-ha" - - sles-15-latest: - project: "suse-cloud" - family: "sles-15" - - sles-15-sp3-sap: + sles-12-5-sap-ha: + project: "suse-sap-cloud" + family: "sles-12-sp5-sap" + # sles-15-1-sap-ha: # removed + # project: "suse-sap-cloud" + # family: "sles-15-sp1-sap" + sles-15-2-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp2-sap" + sles-15-3-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp3-sap" - - sles-15-sp4-sap: + sles-15-4-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp4-sap" - - sles-15-sp5-sap: + sles-15-5-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp5-sap" + sles-15-6-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp6-sap" + sles-12-5-sap-ha-byos: + project: "suse-byos-cloud" + family: "sles-12-sp5-sap-byos" + sles-15-2-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp2-sap-byos" + sles-15-3-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp3-sap-byos" + sles-15-4-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp4-sap-byos" + sles-15-5-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp5-sap-byos" + sles-15-6-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp6-sap-byos" sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: @@ -780,16 +829,31 @@ sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: sap_vm_provision_ibmcloud_vs_host_os_image_dictionary: rhel-8-4: ".*redhat.*8-4.*minimal.*amd64.*" rhel-8-6: ".*redhat.*8-6.*minimal.*amd64.*" + rhel-8-8: ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10: ".*redhat.*8-10.*minimal.*amd64.*" rhel-9-0: ".*redhat.*9-0.*minimal.*amd64.*" rhel-9-2: ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4: ".*redhat.*9-4.*minimal.*amd64.*" + sles-15-5: ".*sles.*15-5.*amd64-[0-9]" + sles-15-6: ".*sles.*15-6.*amd64-[0-9]" + # rhel-7-6-sap-ha: ".*redhat.*7-6.*amd64.*hana.*" # retrievable from deprecated list + # rhel-7-9-sap-ha: ".*redhat.*7-9.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-1-sap-ha: ".*redhat.*8-1.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-2-sap-ha: ".*redhat.*8-2.*amd64.*hana.*" # retrievable from deprecated list rhel-8-4-sap-ha: ".*redhat.*8-4.*amd64.*hana.*" rhel-8-6-sap-ha: ".*redhat.*8-6.*amd64.*hana.*" rhel-8-8-sap-ha: ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha: ".*redhat.*8-10.*amd64.*hana.*" rhel-9-0-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" - rhel-9-2-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha: ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha: ".*redhat.*9-4.*amd64.*hana.*" + # sles-12-4-sap-ha: ".*sles.*12-4.*amd64.*hana.*" # retrievable from deprecated list + # sles-12-5-sap-ha: ".*sles.*12-5.*amd64.*hana.*" # retrievable from deprecated list + # sles-15-1-sap-ha: ".*sles.*15-1.*amd64.*hana.*" # retrievable from deprecated list sles-15-3-sap-ha: ".*sles.*15-3.*amd64.*hana.*" sles-15-4-sap-ha: ".*sles.*15-4.*amd64.*hana.*" sles-15-5-sap-ha: ".*sles.*15-5.*amd64.*hana.*" + sles-15-6-sap-ha: ".*sles.*15-6.*amd64.*hana.*" sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: @@ -1006,96 +1070,186 @@ sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: #### sap_vm_provision_msazure_vm_host_os_image_dictionary: - + rhel-8-0: + publisher: "RedHat" + offer: "RHEL" + sku: "8-gen2" + rhel-8-1: + publisher: "RedHat" + offer: "RHEL" + sku: "81-gen2" + rhel-8-2: + publisher: "RedHat" + offer: "RHEL" + sku: "82-gen2" + rhel-8-3: + publisher: "RedHat" + offer: "RHEL" + sku: "83-gen2" rhel-8-4: publisher: "RedHat" offer: "RHEL" sku: "84-gen2" - + rhel-8-5: + publisher: "RedHat" + offer: "RHEL" + sku: "85-gen2" + rhel-8-6: + publisher: "RedHat" + offer: "RHEL" + sku: "86-gen2" + rhel-8-7: + publisher: "RedHat" + offer: "RHEL" + sku: "87-gen2" + rhel-8-8: + publisher: "RedHat" + offer: "RHEL" + sku: "88-gen2" + rhel-8-9: + publisher: "RedHat" + offer: "RHEL" + sku: "89-gen2" + rhel-8-10: + publisher: "RedHat" + offer: "RHEL" + sku: "810-gen2" + rhel-9-0: + publisher: "RedHat" + offer: "RHEL" + sku: "90-gen2" + rhel-9-1: + publisher: "RedHat" + offer: "RHEL" + sku: "91-gen2" + rhel-9-2: + publisher: "RedHat" + offer: "RHEL" + sku: "92-gen2" + rhel-9-3: + publisher: "RedHat" + offer: "RHEL" + sku: "93-gen2" + rhel-9-4: + publisher: "RedHat" + offer: "RHEL" + sku: "94-gen2" + sles-12-5: + publisher: "SUSE" + offer: "sles-12-sp5" + sku: "gen2" + sles-15-1: + publisher: "SUSE" + offer: "sles-15-sp1" + sku: "gen2" + sles-15-2: + publisher: "SUSE" + offer: "sles-15-sp2" + sku: "gen2" + sles-15-3: + publisher: "SUSE" + offer: "sles-15-sp3" + sku: "gen2" + sles-15-4: + publisher: "SUSE" + offer: "sles-15-sp4" + sku: "gen2" + sles-15-5: + publisher: "SUSE" + offer: "sles-15-sp5" + sku: "gen2" + sles-15-6: + publisher: "SUSE" + offer: "sles-15-sp6" + sku: "gen2" rhel-8-1-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "81sapha-gen2" - rhel-8-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "82sapha-gen2" - rhel-8-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "84sapha-gen2" - rhel-8-6-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "86sapha-gen2" - rhel-8-8-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "88sapha-gen2" - + rhel-8-10-sap-ha: + publisher: "RedHat" + offer: "RHEL-SAP-HA" + sku: "810sapha-gen2" rhel-9-0-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "90sapha-gen2" - rhel-9-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "92sapha-gen2" - - rhel-8-1-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "81sapapps-gen2" - - rhel-8-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "82sapapps-gen2" - - rhel-8-4-sap-applications: + rhel-9-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" - sku: "84sapapps-gen2" - - rhel-8-6-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "86sapapps-gen2" - - rhel-8-8-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "88sapapps-gen2" - - rhel-9-0-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "90sapapps-gen2" - - rhel-9-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "92sapapps-gen2" - - sles-15-sp3-sap: + sku: "94sapha-gen2" + sles-12-5-sap-ha: + publisher: "SUSE" + offer: "sles-sap-12-sp5" + sku: "gen2" + sles-15-1-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp1" + sku: "gen2" + sles-15-2-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp2" + sku: "gen2" + sles-15-3-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp3" sku: "gen2" - - sles-15-sp4-sap: + sles-15-4-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp4" sku: "gen2" - - sles-15-sp5-sap: + sles-15-5-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp5" sku: "gen2" + sles-15-6-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp6" + sku: "gen2" + sles-15-1-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp1-byos" + sku: "gen2" + sles-15-2-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp2-byos" + sku: "gen2" + sles-15-3-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp3-byos" + sku: "gen2" + sles-15-4-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp4-byos" + sku: "gen2" + sles-15-5-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp5-byos" + sku: "gen2" + sles-15-6-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp6-byos" + sku: "gen2" sap_vm_provision_msazure_vm_host_specifications_dictionary: diff --git a/deploy_scenarios/sap_ecc_ibmdb2_distributed/ansible_requirements.yml b/deploy_scenarios/sap_ecc_ibmdb2_distributed/ansible_requirements.yml index af7ed22..1454ec5 100644 --- a/deploy_scenarios/sap_ecc_ibmdb2_distributed/ansible_requirements.yml +++ b/deploy_scenarios/sap_ecc_ibmdb2_distributed/ansible_requirements.yml @@ -8,16 +8,16 @@ collections: version: 6.1.0 - name: fedora.linux_system_roles type: galaxy - version: 1.82.0 + version: 1.88.9 - name: community.sap_install type: galaxy - version: 1.4.0 + version: 1.5.0 - name: community.sap_launchpad type: galaxy - version: 1.1.0 + version: 1.1.1 - name: community.sap_infrastructure type: galaxy - version: 1.0.1 + version: 1.1.0 # - name: community.sap_operations # type: galaxy # version: 0.9.1 @@ -25,23 +25,23 @@ collections: # Collections for Infrastructure from Ansible Galaxy - name: cloud.terraform type: galaxy - version: 1.1.0 + version: 3.0.0 - name: amazon.aws type: galaxy - version: 7.2.0 + version: 9.0.0 - name: community.aws type: galaxy - version: 7.1.0 + version: 9.0.0 - name: azure.azcollection type: galaxy - version: 2.2.0 + version: 3.0.1 - name: google.cloud type: galaxy version: 1.1.3 # Replace with ibm.cloud in future, legacy Ansible Collection uses hidden on-the-fly Terraform files in /var/tmp/ansible/ibmcloud) - name: ibm.cloudcollection type: galaxy - version: 1.51.0 + version: 1.71.2 - name: ovirt.ovirt type: galaxy version: 3.1.2 @@ -53,21 +53,12 @@ collections: version: 3.0.0 - name: cloud.common type: galaxy - version: 3.0.0 + version: 4.0.0 # Collections from public repositories via HTTPS # - name: https://github.com/sap-linuxlab/community.sap_install.git # type: git # version: dev -# - name: https://github.com/sap-linuxlab/community.sap_launchpad.git -# type: git -# version: main -# - name: https://github.com/sap-linuxlab/community.sap_operations.git -# type: git -# version: main -# - name: https://github.com/ansible-collections/cloud.terraform.git -# type: git -# version: main # Collections from private repositories via use SSH (embedded GitHub PAT does not work) # Used for customised/forked Ansible Collections diff --git a/deploy_scenarios/sap_ecc_ibmdb2_distributed/optional/ansible_extravars_noninteractive.yml b/deploy_scenarios/sap_ecc_ibmdb2_distributed/optional/ansible_extravars_noninteractive.yml index 31b94dc..be836e9 100755 --- a/deploy_scenarios/sap_ecc_ibmdb2_distributed/optional/ansible_extravars_noninteractive.yml +++ b/deploy_scenarios/sap_ecc_ibmdb2_distributed/optional/ansible_extravars_noninteractive.yml @@ -295,7 +295,7 @@ sap_id_user: "ENTER_STRING_VALUE_HERE" sap_id_user_password: 'ENTER_STRING_VALUE_HERE' # Directory for SAP installation media -sap_software_download_directory: "ENTER_STRING_VALUE_HERE" +sap_install_media_detect_source_directory: "ENTER_STRING_VALUE_HERE" # e.g. /software #### diff --git a/deploy_scenarios/sap_ecc_ibmdb2_distributed_ha/ansible_extravars.yml b/deploy_scenarios/sap_ecc_ibmdb2_distributed_ha/ansible_extravars.yml index 57f143e..e38c081 100755 --- a/deploy_scenarios/sap_ecc_ibmdb2_distributed_ha/ansible_extravars.yml +++ b/deploy_scenarios/sap_ecc_ibmdb2_distributed_ha/ansible_extravars.yml @@ -49,7 +49,7 @@ sap_netweaver_preconfigure_fail_if_not_enough_swap_space_configured: false #sap_id_user_password: 'SET_IN_VAR_PROMPT' # Directory for SAP installation media -#sap_install_media_detect_source_directory: "SET_IN_VAR_PROMPT" +#sap_software_download_directory: "SET_IN_VAR_PROMPT" # Configuration for SAP installation media detection # sap_install_media_detect_** variables are set for each Ansible Task to the respective host @@ -63,8 +63,8 @@ sap_netweaver_preconfigure_fail_if_not_enough_swap_space_configured: false #sap_vm_temp_vip_anydb_primary: "SET_IN_VAR_PROMPT" #sap_ha_install_anydb_ibmdb2_vip_primary_ip_address: "SET_IN_VAR_PROMPT" -#sap_ha_pacemaker_cluster_vip_nwas_abap_ascs_ip_address: "SET_IN_VAR_PROMPT" -#sap_ha_pacemaker_cluster_vip_nwas_abap_ers_ip_address: "SET_IN_VAR_PROMPT" +#sap_vm_provision_ha_vip_nwas_abap_ascs: "SET_IN_VAR_PROMPT" +#sap_vm_provision_ha_vip_nwas_abap_ers: "SET_IN_VAR_PROMPT" #### @@ -463,27 +463,43 @@ sap_swpm_templates_install_dictionary: sap_vm_provision_aws_ec2_vs_host_os_image_dictionary: rhel-8-1: "*RHEL-8.1*_HVM*x86_64*" - rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" + # rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" # removed rhel-8-4: "*RHEL-8.4*_HVM*x86_64*" rhel-8-6: "*RHEL-8.6*_HVM*x86_64*" rhel-8-8: "*RHEL-8.8*_HVM*x86_64*" + rhel-8-10: "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0: "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1: "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2: "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3: "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4: "*RHEL-9.4*_HVM*x86_64*" + sles-12-5: "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" # removed + # sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" # removed + # sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" # removed + sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6: "*suse-sles-15-sp6-v202*-hvm-ssd-x86_64*" + # rhel-7-7-sap-ha: "*RHEL-SAP-8.1.0*" # removed + # rhel-7-9-sap-ha: "*RHEL-SAP-8.1.0*" # removed rhel-8-1-sap-ha: "*RHEL-SAP-8.1.0*" rhel-8-2-sap-ha: "*RHEL-SAP-8.2.0*" rhel-8-4-sap-ha: "*RHEL-SAP-8.4.0*" rhel-8-6-sap-ha: "*RHEL-SAP-8.6.0*" rhel-8-8-sap-ha: "*RHEL-SAP-8.8.0*" + rhel-8-10-sap-ha: "*RHEL-SAP-8.10.0*" rhel-9-0-sap-ha: "*RHEL-SAP-9.0.0*" rhel-9-2-sap-ha: "*RHEL-SAP-9.2.0*" - sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" - sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" - sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" - sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + rhel-9-4-sap-ha: "*RHEL-SAP-9.4.0*" sles-12-5-sap-ha: "*suse-sles-sap-12-sp5-v202*-hvm-ssd-x86_64*" sles-15-1-sap-ha: "*suse-sles-sap-15-sp1-v202*-hvm-ssd-x86_64*" sles-15-2-sap-ha: "*suse-sles-sap-15-sp2-v202*-hvm-ssd-x86_64*" sles-15-3-sap-ha: "*suse-sles-sap-15-sp3-v202*-hvm-ssd-x86_64*" sles-15-4-sap-ha: "*suse-sles-sap-15-sp4-v202*-hvm-ssd-x86_64*" sles-15-5-sap-ha: "*suse-sles-sap-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha: "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" + sles-15-4-sap-ha-byos: "*suse-sles-sap-15-sp4-byos-v202*-hvm-ssd-x86_64*" + sles-15-5-sap-ha-byos: "*suse-sles-sap-15-sp5-byos-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha-byos: "*suse-sles-sap-15-sp6-byos-v202*-hvm-ssd-x86_64*" sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: @@ -799,42 +815,75 @@ sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: #### sap_vm_provision_gcp_ce_vm_host_os_image_dictionary: - rhel-8-latest: project: "rhel-cloud" family: "rhel-8" - - rhel-8-1-sap-ha: + rhel-9-latest: + project: "rhel-cloud" + family: "rhel-9" + sles-12-latest: + project: "suse-cloud" + family: "sles-12" + sles-15-latest: + project: "suse-cloud" + family: "sles-15" + # rhel-7-7-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-7-7-sap-ha" + rhel-7-9-sap-ha: project: "rhel-sap-cloud" - family: "rhel-8-1-sap-ha" - + family: "rhel-7-9-sap-ha" + # rhel-8-1-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-8-1-sap-ha" rhel-8-2-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-2-sap-ha" - rhel-8-4-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-4-sap-ha" - rhel-8-6-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-6-sap-ha" - - sles-15-latest: - project: "suse-cloud" - family: "sles-15" - - sles-15-sp3-sap: + sles-12-5-sap-ha: + project: "suse-sap-cloud" + family: "sles-12-sp5-sap" + # sles-15-1-sap-ha: # removed + # project: "suse-sap-cloud" + # family: "sles-15-sp1-sap" + sles-15-2-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp2-sap" + sles-15-3-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp3-sap" - - sles-15-sp4-sap: + sles-15-4-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp4-sap" - - sles-15-sp5-sap: + sles-15-5-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp5-sap" + sles-15-6-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp6-sap" + sles-12-5-sap-ha-byos: + project: "suse-byos-cloud" + family: "sles-12-sp5-sap-byos" + sles-15-2-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp2-sap-byos" + sles-15-3-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp3-sap-byos" + sles-15-4-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp4-sap-byos" + sles-15-5-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp5-sap-byos" + sles-15-6-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp6-sap-byos" sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: @@ -1165,16 +1214,31 @@ sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: sap_vm_provision_ibmcloud_vs_host_os_image_dictionary: rhel-8-4: ".*redhat.*8-4.*minimal.*amd64.*" rhel-8-6: ".*redhat.*8-6.*minimal.*amd64.*" + rhel-8-8: ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10: ".*redhat.*8-10.*minimal.*amd64.*" rhel-9-0: ".*redhat.*9-0.*minimal.*amd64.*" rhel-9-2: ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4: ".*redhat.*9-4.*minimal.*amd64.*" + sles-15-5: ".*sles.*15-5.*amd64-[0-9]" + sles-15-6: ".*sles.*15-6.*amd64-[0-9]" + # rhel-7-6-sap-ha: ".*redhat.*7-6.*amd64.*hana.*" # retrievable from deprecated list + # rhel-7-9-sap-ha: ".*redhat.*7-9.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-1-sap-ha: ".*redhat.*8-1.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-2-sap-ha: ".*redhat.*8-2.*amd64.*hana.*" # retrievable from deprecated list rhel-8-4-sap-ha: ".*redhat.*8-4.*amd64.*hana.*" rhel-8-6-sap-ha: ".*redhat.*8-6.*amd64.*hana.*" rhel-8-8-sap-ha: ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha: ".*redhat.*8-10.*amd64.*hana.*" rhel-9-0-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" - rhel-9-2-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha: ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha: ".*redhat.*9-4.*amd64.*hana.*" + # sles-12-4-sap-ha: ".*sles.*12-4.*amd64.*hana.*" # retrievable from deprecated list + # sles-12-5-sap-ha: ".*sles.*12-5.*amd64.*hana.*" # retrievable from deprecated list + # sles-15-1-sap-ha: ".*sles.*15-1.*amd64.*hana.*" # retrievable from deprecated list sles-15-3-sap-ha: ".*sles.*15-3.*amd64.*hana.*" sles-15-4-sap-ha: ".*sles.*15-4.*amd64.*hana.*" sles-15-5-sap-ha: ".*sles.*15-5.*amd64.*hana.*" + sles-15-6-sap-ha: ".*sles.*15-6.*amd64.*hana.*" sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: @@ -1488,96 +1552,186 @@ sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: #### sap_vm_provision_msazure_vm_host_os_image_dictionary: - + rhel-8-0: + publisher: "RedHat" + offer: "RHEL" + sku: "8-gen2" + rhel-8-1: + publisher: "RedHat" + offer: "RHEL" + sku: "81-gen2" + rhel-8-2: + publisher: "RedHat" + offer: "RHEL" + sku: "82-gen2" + rhel-8-3: + publisher: "RedHat" + offer: "RHEL" + sku: "83-gen2" rhel-8-4: publisher: "RedHat" offer: "RHEL" sku: "84-gen2" - + rhel-8-5: + publisher: "RedHat" + offer: "RHEL" + sku: "85-gen2" + rhel-8-6: + publisher: "RedHat" + offer: "RHEL" + sku: "86-gen2" + rhel-8-7: + publisher: "RedHat" + offer: "RHEL" + sku: "87-gen2" + rhel-8-8: + publisher: "RedHat" + offer: "RHEL" + sku: "88-gen2" + rhel-8-9: + publisher: "RedHat" + offer: "RHEL" + sku: "89-gen2" + rhel-8-10: + publisher: "RedHat" + offer: "RHEL" + sku: "810-gen2" + rhel-9-0: + publisher: "RedHat" + offer: "RHEL" + sku: "90-gen2" + rhel-9-1: + publisher: "RedHat" + offer: "RHEL" + sku: "91-gen2" + rhel-9-2: + publisher: "RedHat" + offer: "RHEL" + sku: "92-gen2" + rhel-9-3: + publisher: "RedHat" + offer: "RHEL" + sku: "93-gen2" + rhel-9-4: + publisher: "RedHat" + offer: "RHEL" + sku: "94-gen2" + sles-12-5: + publisher: "SUSE" + offer: "sles-12-sp5" + sku: "gen2" + sles-15-1: + publisher: "SUSE" + offer: "sles-15-sp1" + sku: "gen2" + sles-15-2: + publisher: "SUSE" + offer: "sles-15-sp2" + sku: "gen2" + sles-15-3: + publisher: "SUSE" + offer: "sles-15-sp3" + sku: "gen2" + sles-15-4: + publisher: "SUSE" + offer: "sles-15-sp4" + sku: "gen2" + sles-15-5: + publisher: "SUSE" + offer: "sles-15-sp5" + sku: "gen2" + sles-15-6: + publisher: "SUSE" + offer: "sles-15-sp6" + sku: "gen2" rhel-8-1-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "81sapha-gen2" - rhel-8-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "82sapha-gen2" - rhel-8-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "84sapha-gen2" - rhel-8-6-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "86sapha-gen2" - rhel-8-8-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "88sapha-gen2" - + rhel-8-10-sap-ha: + publisher: "RedHat" + offer: "RHEL-SAP-HA" + sku: "810sapha-gen2" rhel-9-0-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "90sapha-gen2" - rhel-9-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "92sapha-gen2" - - rhel-8-1-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "81sapapps-gen2" - - rhel-8-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "82sapapps-gen2" - - rhel-8-4-sap-applications: + rhel-9-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" - sku: "84sapapps-gen2" - - rhel-8-6-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "86sapapps-gen2" - - rhel-8-8-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "88sapapps-gen2" - - rhel-9-0-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "90sapapps-gen2" - - rhel-9-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "92sapapps-gen2" - - sles-15-sp3-sap: + sku: "94sapha-gen2" + sles-12-5-sap-ha: + publisher: "SUSE" + offer: "sles-sap-12-sp5" + sku: "gen2" + sles-15-1-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp1" + sku: "gen2" + sles-15-2-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp2" + sku: "gen2" + sles-15-3-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp3" sku: "gen2" - - sles-15-sp4-sap: + sles-15-4-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp4" sku: "gen2" - - sles-15-sp5-sap: + sles-15-5-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp5" sku: "gen2" + sles-15-6-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp6" + sku: "gen2" + sles-15-1-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp1-byos" + sku: "gen2" + sles-15-2-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp2-byos" + sku: "gen2" + sles-15-3-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp3-byos" + sku: "gen2" + sles-15-4-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp4-byos" + sku: "gen2" + sles-15-5-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp5-byos" + sku: "gen2" + sles-15-6-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp6-byos" + sku: "gen2" sap_vm_provision_msazure_vm_host_specifications_dictionary: diff --git a/deploy_scenarios/sap_ecc_ibmdb2_distributed_ha/ansible_requirements.yml b/deploy_scenarios/sap_ecc_ibmdb2_distributed_ha/ansible_requirements.yml index 79dc80e..1454ec5 100644 --- a/deploy_scenarios/sap_ecc_ibmdb2_distributed_ha/ansible_requirements.yml +++ b/deploy_scenarios/sap_ecc_ibmdb2_distributed_ha/ansible_requirements.yml @@ -8,16 +8,16 @@ collections: version: 6.1.0 - name: fedora.linux_system_roles type: galaxy - version: 1.82.0 + version: 1.88.9 - name: community.sap_install type: galaxy - version: 1.4.2 + version: 1.5.0 - name: community.sap_launchpad type: galaxy - version: 1.1.0 + version: 1.1.1 - name: community.sap_infrastructure type: galaxy - version: 1.0.1 + version: 1.1.0 # - name: community.sap_operations # type: galaxy # version: 0.9.1 @@ -25,23 +25,23 @@ collections: # Collections for Infrastructure from Ansible Galaxy - name: cloud.terraform type: galaxy - version: 1.1.0 + version: 3.0.0 - name: amazon.aws type: galaxy - version: 7.2.0 + version: 9.0.0 - name: community.aws type: galaxy - version: 7.1.0 + version: 9.0.0 - name: azure.azcollection type: galaxy - version: 2.2.0 + version: 3.0.1 - name: google.cloud type: galaxy version: 1.1.3 # Replace with ibm.cloud in future, legacy Ansible Collection uses hidden on-the-fly Terraform files in /var/tmp/ansible/ibmcloud) - name: ibm.cloudcollection type: galaxy - version: 1.51.0 + version: 1.71.2 - name: ovirt.ovirt type: galaxy version: 3.1.2 @@ -53,21 +53,12 @@ collections: version: 3.0.0 - name: cloud.common type: galaxy - version: 3.0.0 + version: 4.0.0 # Collections from public repositories via HTTPS # - name: https://github.com/sap-linuxlab/community.sap_install.git # type: git # version: dev -# - name: https://github.com/sap-linuxlab/community.sap_launchpad.git -# type: git -# version: main -# - name: https://github.com/sap-linuxlab/community.sap_operations.git -# type: git -# version: main -# - name: https://github.com/ansible-collections/cloud.terraform.git -# type: git -# version: main # Collections from private repositories via use SSH (embedded GitHub PAT does not work) # Used for customised/forked Ansible Collections diff --git a/deploy_scenarios/sap_ecc_ibmdb2_distributed_ha/optional/ansible_extravars_noninteractive.yml b/deploy_scenarios/sap_ecc_ibmdb2_distributed_ha/optional/ansible_extravars_noninteractive.yml index 9da6d21..bbe5ef3 100755 --- a/deploy_scenarios/sap_ecc_ibmdb2_distributed_ha/optional/ansible_extravars_noninteractive.yml +++ b/deploy_scenarios/sap_ecc_ibmdb2_distributed_ha/optional/ansible_extravars_noninteractive.yml @@ -264,7 +264,7 @@ sap_id_user: "ENTER_STRING_VALUE_HERE" sap_id_user_password: 'ENTER_STRING_VALUE_HERE' # Directory for SAP installation media -sap_install_media_detect_source_directory: "ENTER_STRING_VALUE_HERE" +sap_install_media_detect_source_directory: "ENTER_STRING_VALUE_HERE" # e.g. /software #### @@ -275,8 +275,8 @@ sap_vm_provision_ha_vip_anydb_primary: "ENTER_STRING_VALUE_HERE" # sap_vm_temp_vip_anydb_primary: "ENTER_STRING_VALUE_HERE" # sap_ha_install_anydb_ibmdb2_vip_primary_ip_address: "ENTER_STRING_VALUE_HERE" -sap_ha_pacemaker_cluster_vip_nwas_abap_ascs_ip_address: "ENTER_STRING_VALUE_HERE" -sap_ha_pacemaker_cluster_vip_nwas_abap_ers_ip_address: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ha_vip_nwas_abap_ascs: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ha_vip_nwas_abap_ers: "ENTER_STRING_VALUE_HERE" #### diff --git a/deploy_scenarios/sap_ecc_ibmdb2_sandbox/ansible_extravars.yml b/deploy_scenarios/sap_ecc_ibmdb2_sandbox/ansible_extravars.yml index 2432541..6209395 100755 --- a/deploy_scenarios/sap_ecc_ibmdb2_sandbox/ansible_extravars.yml +++ b/deploy_scenarios/sap_ecc_ibmdb2_sandbox/ansible_extravars.yml @@ -222,27 +222,43 @@ sap_swpm_templates_install_dictionary: sap_vm_provision_aws_ec2_vs_host_os_image_dictionary: rhel-8-1: "*RHEL-8.1*_HVM*x86_64*" - rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" + # rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" # removed rhel-8-4: "*RHEL-8.4*_HVM*x86_64*" rhel-8-6: "*RHEL-8.6*_HVM*x86_64*" rhel-8-8: "*RHEL-8.8*_HVM*x86_64*" + rhel-8-10: "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0: "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1: "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2: "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3: "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4: "*RHEL-9.4*_HVM*x86_64*" + sles-12-5: "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" # removed + # sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" # removed + # sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" # removed + sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6: "*suse-sles-15-sp6-v202*-hvm-ssd-x86_64*" + # rhel-7-7-sap-ha: "*RHEL-SAP-8.1.0*" # removed + # rhel-7-9-sap-ha: "*RHEL-SAP-8.1.0*" # removed rhel-8-1-sap-ha: "*RHEL-SAP-8.1.0*" rhel-8-2-sap-ha: "*RHEL-SAP-8.2.0*" rhel-8-4-sap-ha: "*RHEL-SAP-8.4.0*" rhel-8-6-sap-ha: "*RHEL-SAP-8.6.0*" rhel-8-8-sap-ha: "*RHEL-SAP-8.8.0*" + rhel-8-10-sap-ha: "*RHEL-SAP-8.10.0*" rhel-9-0-sap-ha: "*RHEL-SAP-9.0.0*" rhel-9-2-sap-ha: "*RHEL-SAP-9.2.0*" - sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" - sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" - sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" - sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + rhel-9-4-sap-ha: "*RHEL-SAP-9.4.0*" sles-12-5-sap-ha: "*suse-sles-sap-12-sp5-v202*-hvm-ssd-x86_64*" sles-15-1-sap-ha: "*suse-sles-sap-15-sp1-v202*-hvm-ssd-x86_64*" sles-15-2-sap-ha: "*suse-sles-sap-15-sp2-v202*-hvm-ssd-x86_64*" sles-15-3-sap-ha: "*suse-sles-sap-15-sp3-v202*-hvm-ssd-x86_64*" sles-15-4-sap-ha: "*suse-sles-sap-15-sp4-v202*-hvm-ssd-x86_64*" sles-15-5-sap-ha: "*suse-sles-sap-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha: "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" + sles-15-4-sap-ha-byos: "*suse-sles-sap-15-sp4-byos-v202*-hvm-ssd-x86_64*" + sles-15-5-sap-ha-byos: "*suse-sles-sap-15-sp5-byos-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha-byos: "*suse-sles-sap-15-sp6-byos-v202*-hvm-ssd-x86_64*" sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: @@ -310,42 +326,75 @@ sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: #### sap_vm_provision_gcp_ce_vm_host_os_image_dictionary: - rhel-8-latest: project: "rhel-cloud" family: "rhel-8" - - rhel-8-1-sap-ha: + rhel-9-latest: + project: "rhel-cloud" + family: "rhel-9" + sles-12-latest: + project: "suse-cloud" + family: "sles-12" + sles-15-latest: + project: "suse-cloud" + family: "sles-15" + # rhel-7-7-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-7-7-sap-ha" + rhel-7-9-sap-ha: project: "rhel-sap-cloud" - family: "rhel-8-1-sap-ha" - + family: "rhel-7-9-sap-ha" + # rhel-8-1-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-8-1-sap-ha" rhel-8-2-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-2-sap-ha" - rhel-8-4-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-4-sap-ha" - rhel-8-6-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-6-sap-ha" - - sles-15-latest: - project: "suse-cloud" - family: "sles-15" - - sles-15-sp3-sap: + sles-12-5-sap-ha: + project: "suse-sap-cloud" + family: "sles-12-sp5-sap" + # sles-15-1-sap-ha: # removed + # project: "suse-sap-cloud" + # family: "sles-15-sp1-sap" + sles-15-2-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp2-sap" + sles-15-3-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp3-sap" - - sles-15-sp4-sap: + sles-15-4-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp4-sap" - - sles-15-sp5-sap: + sles-15-5-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp5-sap" + sles-15-6-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp6-sap" + sles-12-5-sap-ha-byos: + project: "suse-byos-cloud" + family: "sles-12-sp5-sap-byos" + sles-15-2-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp2-sap-byos" + sles-15-3-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp3-sap-byos" + sles-15-4-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp4-sap-byos" + sles-15-5-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp5-sap-byos" + sles-15-6-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp6-sap-byos" sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: @@ -420,16 +469,31 @@ sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: sap_vm_provision_ibmcloud_vs_host_os_image_dictionary: rhel-8-4: ".*redhat.*8-4.*minimal.*amd64.*" rhel-8-6: ".*redhat.*8-6.*minimal.*amd64.*" + rhel-8-8: ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10: ".*redhat.*8-10.*minimal.*amd64.*" rhel-9-0: ".*redhat.*9-0.*minimal.*amd64.*" rhel-9-2: ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4: ".*redhat.*9-4.*minimal.*amd64.*" + sles-15-5: ".*sles.*15-5.*amd64-[0-9]" + sles-15-6: ".*sles.*15-6.*amd64-[0-9]" + # rhel-7-6-sap-ha: ".*redhat.*7-6.*amd64.*hana.*" # retrievable from deprecated list + # rhel-7-9-sap-ha: ".*redhat.*7-9.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-1-sap-ha: ".*redhat.*8-1.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-2-sap-ha: ".*redhat.*8-2.*amd64.*hana.*" # retrievable from deprecated list rhel-8-4-sap-ha: ".*redhat.*8-4.*amd64.*hana.*" rhel-8-6-sap-ha: ".*redhat.*8-6.*amd64.*hana.*" rhel-8-8-sap-ha: ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha: ".*redhat.*8-10.*amd64.*hana.*" rhel-9-0-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" - rhel-9-2-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha: ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha: ".*redhat.*9-4.*amd64.*hana.*" + # sles-12-4-sap-ha: ".*sles.*12-4.*amd64.*hana.*" # retrievable from deprecated list + # sles-12-5-sap-ha: ".*sles.*12-5.*amd64.*hana.*" # retrievable from deprecated list + # sles-15-1-sap-ha: ".*sles.*15-1.*amd64.*hana.*" # retrievable from deprecated list sles-15-3-sap-ha: ".*sles.*15-3.*amd64.*hana.*" sles-15-4-sap-ha: ".*sles.*15-4.*amd64.*hana.*" sles-15-5-sap-ha: ".*sles.*15-5.*amd64.*hana.*" + sles-15-6-sap-ha: ".*sles.*15-6.*amd64.*hana.*" sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: @@ -502,96 +566,186 @@ sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: #### sap_vm_provision_msazure_vm_host_os_image_dictionary: - + rhel-8-0: + publisher: "RedHat" + offer: "RHEL" + sku: "8-gen2" + rhel-8-1: + publisher: "RedHat" + offer: "RHEL" + sku: "81-gen2" + rhel-8-2: + publisher: "RedHat" + offer: "RHEL" + sku: "82-gen2" + rhel-8-3: + publisher: "RedHat" + offer: "RHEL" + sku: "83-gen2" rhel-8-4: publisher: "RedHat" offer: "RHEL" sku: "84-gen2" - + rhel-8-5: + publisher: "RedHat" + offer: "RHEL" + sku: "85-gen2" + rhel-8-6: + publisher: "RedHat" + offer: "RHEL" + sku: "86-gen2" + rhel-8-7: + publisher: "RedHat" + offer: "RHEL" + sku: "87-gen2" + rhel-8-8: + publisher: "RedHat" + offer: "RHEL" + sku: "88-gen2" + rhel-8-9: + publisher: "RedHat" + offer: "RHEL" + sku: "89-gen2" + rhel-8-10: + publisher: "RedHat" + offer: "RHEL" + sku: "810-gen2" + rhel-9-0: + publisher: "RedHat" + offer: "RHEL" + sku: "90-gen2" + rhel-9-1: + publisher: "RedHat" + offer: "RHEL" + sku: "91-gen2" + rhel-9-2: + publisher: "RedHat" + offer: "RHEL" + sku: "92-gen2" + rhel-9-3: + publisher: "RedHat" + offer: "RHEL" + sku: "93-gen2" + rhel-9-4: + publisher: "RedHat" + offer: "RHEL" + sku: "94-gen2" + sles-12-5: + publisher: "SUSE" + offer: "sles-12-sp5" + sku: "gen2" + sles-15-1: + publisher: "SUSE" + offer: "sles-15-sp1" + sku: "gen2" + sles-15-2: + publisher: "SUSE" + offer: "sles-15-sp2" + sku: "gen2" + sles-15-3: + publisher: "SUSE" + offer: "sles-15-sp3" + sku: "gen2" + sles-15-4: + publisher: "SUSE" + offer: "sles-15-sp4" + sku: "gen2" + sles-15-5: + publisher: "SUSE" + offer: "sles-15-sp5" + sku: "gen2" + sles-15-6: + publisher: "SUSE" + offer: "sles-15-sp6" + sku: "gen2" rhel-8-1-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "81sapha-gen2" - rhel-8-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "82sapha-gen2" - rhel-8-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "84sapha-gen2" - rhel-8-6-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "86sapha-gen2" - rhel-8-8-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "88sapha-gen2" - + rhel-8-10-sap-ha: + publisher: "RedHat" + offer: "RHEL-SAP-HA" + sku: "810sapha-gen2" rhel-9-0-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "90sapha-gen2" - rhel-9-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "92sapha-gen2" - - rhel-8-1-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "81sapapps-gen2" - - rhel-8-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "82sapapps-gen2" - - rhel-8-4-sap-applications: + rhel-9-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" - sku: "84sapapps-gen2" - - rhel-8-6-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "86sapapps-gen2" - - rhel-8-8-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "88sapapps-gen2" - - rhel-9-0-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "90sapapps-gen2" - - rhel-9-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "92sapapps-gen2" - - sles-15-sp3-sap: + sku: "94sapha-gen2" + sles-12-5-sap-ha: + publisher: "SUSE" + offer: "sles-sap-12-sp5" + sku: "gen2" + sles-15-1-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp1" + sku: "gen2" + sles-15-2-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp2" + sku: "gen2" + sles-15-3-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp3" sku: "gen2" - - sles-15-sp4-sap: + sles-15-4-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp4" sku: "gen2" - - sles-15-sp5-sap: + sles-15-5-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp5" sku: "gen2" + sles-15-6-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp6" + sku: "gen2" + sles-15-1-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp1-byos" + sku: "gen2" + sles-15-2-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp2-byos" + sku: "gen2" + sles-15-3-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp3-byos" + sku: "gen2" + sles-15-4-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp4-byos" + sku: "gen2" + sles-15-5-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp5-byos" + sku: "gen2" + sles-15-6-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp6-byos" + sku: "gen2" sap_vm_provision_msazure_vm_host_specifications_dictionary: diff --git a/deploy_scenarios/sap_ecc_ibmdb2_sandbox/ansible_requirements.yml b/deploy_scenarios/sap_ecc_ibmdb2_sandbox/ansible_requirements.yml index af7ed22..1454ec5 100644 --- a/deploy_scenarios/sap_ecc_ibmdb2_sandbox/ansible_requirements.yml +++ b/deploy_scenarios/sap_ecc_ibmdb2_sandbox/ansible_requirements.yml @@ -8,16 +8,16 @@ collections: version: 6.1.0 - name: fedora.linux_system_roles type: galaxy - version: 1.82.0 + version: 1.88.9 - name: community.sap_install type: galaxy - version: 1.4.0 + version: 1.5.0 - name: community.sap_launchpad type: galaxy - version: 1.1.0 + version: 1.1.1 - name: community.sap_infrastructure type: galaxy - version: 1.0.1 + version: 1.1.0 # - name: community.sap_operations # type: galaxy # version: 0.9.1 @@ -25,23 +25,23 @@ collections: # Collections for Infrastructure from Ansible Galaxy - name: cloud.terraform type: galaxy - version: 1.1.0 + version: 3.0.0 - name: amazon.aws type: galaxy - version: 7.2.0 + version: 9.0.0 - name: community.aws type: galaxy - version: 7.1.0 + version: 9.0.0 - name: azure.azcollection type: galaxy - version: 2.2.0 + version: 3.0.1 - name: google.cloud type: galaxy version: 1.1.3 # Replace with ibm.cloud in future, legacy Ansible Collection uses hidden on-the-fly Terraform files in /var/tmp/ansible/ibmcloud) - name: ibm.cloudcollection type: galaxy - version: 1.51.0 + version: 1.71.2 - name: ovirt.ovirt type: galaxy version: 3.1.2 @@ -53,21 +53,12 @@ collections: version: 3.0.0 - name: cloud.common type: galaxy - version: 3.0.0 + version: 4.0.0 # Collections from public repositories via HTTPS # - name: https://github.com/sap-linuxlab/community.sap_install.git # type: git # version: dev -# - name: https://github.com/sap-linuxlab/community.sap_launchpad.git -# type: git -# version: main -# - name: https://github.com/sap-linuxlab/community.sap_operations.git -# type: git -# version: main -# - name: https://github.com/ansible-collections/cloud.terraform.git -# type: git -# version: main # Collections from private repositories via use SSH (embedded GitHub PAT does not work) # Used for customised/forked Ansible Collections diff --git a/deploy_scenarios/sap_ecc_ibmdb2_sandbox/optional/ansible_extravars_noninteractive.yml b/deploy_scenarios/sap_ecc_ibmdb2_sandbox/optional/ansible_extravars_noninteractive.yml index f216b1e..a4e9f37 100755 --- a/deploy_scenarios/sap_ecc_ibmdb2_sandbox/optional/ansible_extravars_noninteractive.yml +++ b/deploy_scenarios/sap_ecc_ibmdb2_sandbox/optional/ansible_extravars_noninteractive.yml @@ -270,7 +270,7 @@ sap_id_user: "ENTER_STRING_VALUE_HERE" sap_id_user_password: 'ENTER_STRING_VALUE_HERE' # Directory for SAP installation media -sap_software_download_directory: "ENTER_STRING_VALUE_HERE" +sap_install_media_detect_source_directory: "ENTER_STRING_VALUE_HERE" # e.g. /software #### diff --git a/deploy_scenarios/sap_ecc_oracledb_sandbox/ansible_extravars.yml b/deploy_scenarios/sap_ecc_oracledb_sandbox/ansible_extravars.yml index 284268d..5cef8f1 100755 --- a/deploy_scenarios/sap_ecc_oracledb_sandbox/ansible_extravars.yml +++ b/deploy_scenarios/sap_ecc_oracledb_sandbox/ansible_extravars.yml @@ -183,27 +183,43 @@ sap_swpm_templates_install_dictionary: sap_vm_provision_aws_ec2_vs_host_os_image_dictionary: rhel-8-1: "*RHEL-8.1*_HVM*x86_64*" - rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" + # rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" # removed rhel-8-4: "*RHEL-8.4*_HVM*x86_64*" rhel-8-6: "*RHEL-8.6*_HVM*x86_64*" rhel-8-8: "*RHEL-8.8*_HVM*x86_64*" + rhel-8-10: "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0: "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1: "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2: "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3: "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4: "*RHEL-9.4*_HVM*x86_64*" + sles-12-5: "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" # removed + # sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" # removed + # sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" # removed + sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6: "*suse-sles-15-sp6-v202*-hvm-ssd-x86_64*" + # rhel-7-7-sap-ha: "*RHEL-SAP-8.1.0*" # removed + # rhel-7-9-sap-ha: "*RHEL-SAP-8.1.0*" # removed rhel-8-1-sap-ha: "*RHEL-SAP-8.1.0*" rhel-8-2-sap-ha: "*RHEL-SAP-8.2.0*" rhel-8-4-sap-ha: "*RHEL-SAP-8.4.0*" rhel-8-6-sap-ha: "*RHEL-SAP-8.6.0*" rhel-8-8-sap-ha: "*RHEL-SAP-8.8.0*" + rhel-8-10-sap-ha: "*RHEL-SAP-8.10.0*" rhel-9-0-sap-ha: "*RHEL-SAP-9.0.0*" rhel-9-2-sap-ha: "*RHEL-SAP-9.2.0*" - sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" - sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" - sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" - sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + rhel-9-4-sap-ha: "*RHEL-SAP-9.4.0*" sles-12-5-sap-ha: "*suse-sles-sap-12-sp5-v202*-hvm-ssd-x86_64*" sles-15-1-sap-ha: "*suse-sles-sap-15-sp1-v202*-hvm-ssd-x86_64*" sles-15-2-sap-ha: "*suse-sles-sap-15-sp2-v202*-hvm-ssd-x86_64*" sles-15-3-sap-ha: "*suse-sles-sap-15-sp3-v202*-hvm-ssd-x86_64*" sles-15-4-sap-ha: "*suse-sles-sap-15-sp4-v202*-hvm-ssd-x86_64*" sles-15-5-sap-ha: "*suse-sles-sap-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha: "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" + sles-15-4-sap-ha-byos: "*suse-sles-sap-15-sp4-byos-v202*-hvm-ssd-x86_64*" + sles-15-5-sap-ha-byos: "*suse-sles-sap-15-sp5-byos-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha-byos: "*suse-sles-sap-15-sp6-byos-v202*-hvm-ssd-x86_64*" sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: @@ -281,42 +297,75 @@ sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: #### sap_vm_provision_gcp_ce_vm_host_os_image_dictionary: - rhel-8-latest: project: "rhel-cloud" family: "rhel-8" - - rhel-8-1-sap-ha: + rhel-9-latest: + project: "rhel-cloud" + family: "rhel-9" + sles-12-latest: + project: "suse-cloud" + family: "sles-12" + sles-15-latest: + project: "suse-cloud" + family: "sles-15" + # rhel-7-7-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-7-7-sap-ha" + rhel-7-9-sap-ha: project: "rhel-sap-cloud" - family: "rhel-8-1-sap-ha" - + family: "rhel-7-9-sap-ha" + # rhel-8-1-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-8-1-sap-ha" rhel-8-2-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-2-sap-ha" - rhel-8-4-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-4-sap-ha" - rhel-8-6-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-6-sap-ha" - - sles-15-latest: - project: "suse-cloud" - family: "sles-15" - - sles-15-sp3-sap: + sles-12-5-sap-ha: + project: "suse-sap-cloud" + family: "sles-12-sp5-sap" + # sles-15-1-sap-ha: # removed + # project: "suse-sap-cloud" + # family: "sles-15-sp1-sap" + sles-15-2-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp2-sap" + sles-15-3-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp3-sap" - - sles-15-sp4-sap: + sles-15-4-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp4-sap" - - sles-15-sp5-sap: + sles-15-5-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp5-sap" + sles-15-6-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp6-sap" + sles-12-5-sap-ha-byos: + project: "suse-byos-cloud" + family: "sles-12-sp5-sap-byos" + sles-15-2-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp2-sap-byos" + sles-15-3-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp3-sap-byos" + sles-15-4-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp4-sap-byos" + sles-15-5-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp5-sap-byos" + sles-15-6-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp6-sap-byos" sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: @@ -399,16 +448,31 @@ sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: sap_vm_provision_ibmcloud_vs_host_os_image_dictionary: rhel-8-4: ".*redhat.*8-4.*minimal.*amd64.*" rhel-8-6: ".*redhat.*8-6.*minimal.*amd64.*" + rhel-8-8: ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10: ".*redhat.*8-10.*minimal.*amd64.*" rhel-9-0: ".*redhat.*9-0.*minimal.*amd64.*" rhel-9-2: ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4: ".*redhat.*9-4.*minimal.*amd64.*" + sles-15-5: ".*sles.*15-5.*amd64-[0-9]" + sles-15-6: ".*sles.*15-6.*amd64-[0-9]" + # rhel-7-6-sap-ha: ".*redhat.*7-6.*amd64.*hana.*" # retrievable from deprecated list + # rhel-7-9-sap-ha: ".*redhat.*7-9.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-1-sap-ha: ".*redhat.*8-1.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-2-sap-ha: ".*redhat.*8-2.*amd64.*hana.*" # retrievable from deprecated list rhel-8-4-sap-ha: ".*redhat.*8-4.*amd64.*hana.*" rhel-8-6-sap-ha: ".*redhat.*8-6.*amd64.*hana.*" rhel-8-8-sap-ha: ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha: ".*redhat.*8-10.*amd64.*hana.*" rhel-9-0-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" - rhel-9-2-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha: ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha: ".*redhat.*9-4.*amd64.*hana.*" + # sles-12-4-sap-ha: ".*sles.*12-4.*amd64.*hana.*" # retrievable from deprecated list + # sles-12-5-sap-ha: ".*sles.*12-5.*amd64.*hana.*" # retrievable from deprecated list + # sles-15-1-sap-ha: ".*sles.*15-1.*amd64.*hana.*" # retrievable from deprecated list sles-15-3-sap-ha: ".*sles.*15-3.*amd64.*hana.*" sles-15-4-sap-ha: ".*sles.*15-4.*amd64.*hana.*" sles-15-5-sap-ha: ".*sles.*15-5.*amd64.*hana.*" + sles-15-6-sap-ha: ".*sles.*15-6.*amd64.*hana.*" sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: @@ -493,96 +557,186 @@ sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: #### sap_vm_provision_msazure_vm_host_os_image_dictionary: - + rhel-8-0: + publisher: "RedHat" + offer: "RHEL" + sku: "8-gen2" + rhel-8-1: + publisher: "RedHat" + offer: "RHEL" + sku: "81-gen2" + rhel-8-2: + publisher: "RedHat" + offer: "RHEL" + sku: "82-gen2" + rhel-8-3: + publisher: "RedHat" + offer: "RHEL" + sku: "83-gen2" rhel-8-4: publisher: "RedHat" offer: "RHEL" sku: "84-gen2" - + rhel-8-5: + publisher: "RedHat" + offer: "RHEL" + sku: "85-gen2" + rhel-8-6: + publisher: "RedHat" + offer: "RHEL" + sku: "86-gen2" + rhel-8-7: + publisher: "RedHat" + offer: "RHEL" + sku: "87-gen2" + rhel-8-8: + publisher: "RedHat" + offer: "RHEL" + sku: "88-gen2" + rhel-8-9: + publisher: "RedHat" + offer: "RHEL" + sku: "89-gen2" + rhel-8-10: + publisher: "RedHat" + offer: "RHEL" + sku: "810-gen2" + rhel-9-0: + publisher: "RedHat" + offer: "RHEL" + sku: "90-gen2" + rhel-9-1: + publisher: "RedHat" + offer: "RHEL" + sku: "91-gen2" + rhel-9-2: + publisher: "RedHat" + offer: "RHEL" + sku: "92-gen2" + rhel-9-3: + publisher: "RedHat" + offer: "RHEL" + sku: "93-gen2" + rhel-9-4: + publisher: "RedHat" + offer: "RHEL" + sku: "94-gen2" + sles-12-5: + publisher: "SUSE" + offer: "sles-12-sp5" + sku: "gen2" + sles-15-1: + publisher: "SUSE" + offer: "sles-15-sp1" + sku: "gen2" + sles-15-2: + publisher: "SUSE" + offer: "sles-15-sp2" + sku: "gen2" + sles-15-3: + publisher: "SUSE" + offer: "sles-15-sp3" + sku: "gen2" + sles-15-4: + publisher: "SUSE" + offer: "sles-15-sp4" + sku: "gen2" + sles-15-5: + publisher: "SUSE" + offer: "sles-15-sp5" + sku: "gen2" + sles-15-6: + publisher: "SUSE" + offer: "sles-15-sp6" + sku: "gen2" rhel-8-1-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "81sapha-gen2" - rhel-8-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "82sapha-gen2" - rhel-8-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "84sapha-gen2" - rhel-8-6-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "86sapha-gen2" - rhel-8-8-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "88sapha-gen2" - + rhel-8-10-sap-ha: + publisher: "RedHat" + offer: "RHEL-SAP-HA" + sku: "810sapha-gen2" rhel-9-0-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "90sapha-gen2" - rhel-9-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "92sapha-gen2" - - rhel-8-1-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "81sapapps-gen2" - - rhel-8-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "82sapapps-gen2" - - rhel-8-4-sap-applications: + rhel-9-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" - sku: "84sapapps-gen2" - - rhel-8-6-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "86sapapps-gen2" - - rhel-8-8-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "88sapapps-gen2" - - rhel-9-0-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "90sapapps-gen2" - - rhel-9-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "92sapapps-gen2" - - sles-15-sp3-sap: + sku: "94sapha-gen2" + sles-12-5-sap-ha: + publisher: "SUSE" + offer: "sles-sap-12-sp5" + sku: "gen2" + sles-15-1-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp1" + sku: "gen2" + sles-15-2-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp2" + sku: "gen2" + sles-15-3-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp3" sku: "gen2" - - sles-15-sp4-sap: + sles-15-4-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp4" sku: "gen2" - - sles-15-sp5-sap: + sles-15-5-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp5" sku: "gen2" + sles-15-6-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp6" + sku: "gen2" + sles-15-1-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp1-byos" + sku: "gen2" + sles-15-2-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp2-byos" + sku: "gen2" + sles-15-3-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp3-byos" + sku: "gen2" + sles-15-4-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp4-byos" + sku: "gen2" + sles-15-5-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp5-byos" + sku: "gen2" + sles-15-6-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp6-byos" + sku: "gen2" sap_vm_provision_msazure_vm_host_specifications_dictionary: diff --git a/deploy_scenarios/sap_ecc_oracledb_sandbox/ansible_requirements.yml b/deploy_scenarios/sap_ecc_oracledb_sandbox/ansible_requirements.yml index af7ed22..1454ec5 100644 --- a/deploy_scenarios/sap_ecc_oracledb_sandbox/ansible_requirements.yml +++ b/deploy_scenarios/sap_ecc_oracledb_sandbox/ansible_requirements.yml @@ -8,16 +8,16 @@ collections: version: 6.1.0 - name: fedora.linux_system_roles type: galaxy - version: 1.82.0 + version: 1.88.9 - name: community.sap_install type: galaxy - version: 1.4.0 + version: 1.5.0 - name: community.sap_launchpad type: galaxy - version: 1.1.0 + version: 1.1.1 - name: community.sap_infrastructure type: galaxy - version: 1.0.1 + version: 1.1.0 # - name: community.sap_operations # type: galaxy # version: 0.9.1 @@ -25,23 +25,23 @@ collections: # Collections for Infrastructure from Ansible Galaxy - name: cloud.terraform type: galaxy - version: 1.1.0 + version: 3.0.0 - name: amazon.aws type: galaxy - version: 7.2.0 + version: 9.0.0 - name: community.aws type: galaxy - version: 7.1.0 + version: 9.0.0 - name: azure.azcollection type: galaxy - version: 2.2.0 + version: 3.0.1 - name: google.cloud type: galaxy version: 1.1.3 # Replace with ibm.cloud in future, legacy Ansible Collection uses hidden on-the-fly Terraform files in /var/tmp/ansible/ibmcloud) - name: ibm.cloudcollection type: galaxy - version: 1.51.0 + version: 1.71.2 - name: ovirt.ovirt type: galaxy version: 3.1.2 @@ -53,21 +53,12 @@ collections: version: 3.0.0 - name: cloud.common type: galaxy - version: 3.0.0 + version: 4.0.0 # Collections from public repositories via HTTPS # - name: https://github.com/sap-linuxlab/community.sap_install.git # type: git # version: dev -# - name: https://github.com/sap-linuxlab/community.sap_launchpad.git -# type: git -# version: main -# - name: https://github.com/sap-linuxlab/community.sap_operations.git -# type: git -# version: main -# - name: https://github.com/ansible-collections/cloud.terraform.git -# type: git -# version: main # Collections from private repositories via use SSH (embedded GitHub PAT does not work) # Used for customised/forked Ansible Collections diff --git a/deploy_scenarios/sap_ecc_oracledb_sandbox/optional/ansible_extravars_noninteractive.yml b/deploy_scenarios/sap_ecc_oracledb_sandbox/optional/ansible_extravars_noninteractive.yml index e66d916..468d632 100755 --- a/deploy_scenarios/sap_ecc_oracledb_sandbox/optional/ansible_extravars_noninteractive.yml +++ b/deploy_scenarios/sap_ecc_oracledb_sandbox/optional/ansible_extravars_noninteractive.yml @@ -270,7 +270,7 @@ sap_id_user: "ENTER_STRING_VALUE_HERE" sap_id_user_password: 'ENTER_STRING_VALUE_HERE' # Directory for SAP installation media -sap_software_download_directory: "ENTER_STRING_VALUE_HERE" +sap_install_media_detect_source_directory: "ENTER_STRING_VALUE_HERE" # e.g. /software #### diff --git a/deploy_scenarios/sap_ecc_sapase_sandbox/ansible_extravars.yml b/deploy_scenarios/sap_ecc_sapase_sandbox/ansible_extravars.yml index 89fd9a0..d90f1b2 100755 --- a/deploy_scenarios/sap_ecc_sapase_sandbox/ansible_extravars.yml +++ b/deploy_scenarios/sap_ecc_sapase_sandbox/ansible_extravars.yml @@ -129,7 +129,7 @@ sap_swpm_templates_install_dictionary: - 'igsexe_13-80003187.sar' # IGS 7.53 - 'igshelper_17-10010245.sar' - 'SYBCTRL_1423-80002616.SAR' - - '51057804_1' # SAP ASE 16.0.04.06 RDBMS Linux on x86_64 64bit + - '51057961_1' # SAP ASE 16.0.04.06 HF1 RDBMS Linux on x86_64 64bit - 'ASEBC16004P_5-20012477.SAR' # SAP ASE 16.0 SP04 (160-04) FOR BUS. SUITE DBCLIENT with Patch (P_*) - '51050708_1' # SAP ERP 6.0 EHP8 Installation Export 1/4, Self-extract RAR EXE - '51050708_2' @@ -156,27 +156,43 @@ sap_swpm_templates_install_dictionary: sap_vm_provision_aws_ec2_vs_host_os_image_dictionary: rhel-8-1: "*RHEL-8.1*_HVM*x86_64*" - rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" + # rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" # removed rhel-8-4: "*RHEL-8.4*_HVM*x86_64*" rhel-8-6: "*RHEL-8.6*_HVM*x86_64*" rhel-8-8: "*RHEL-8.8*_HVM*x86_64*" + rhel-8-10: "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0: "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1: "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2: "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3: "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4: "*RHEL-9.4*_HVM*x86_64*" + sles-12-5: "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" # removed + # sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" # removed + # sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" # removed + sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6: "*suse-sles-15-sp6-v202*-hvm-ssd-x86_64*" + # rhel-7-7-sap-ha: "*RHEL-SAP-8.1.0*" # removed + # rhel-7-9-sap-ha: "*RHEL-SAP-8.1.0*" # removed rhel-8-1-sap-ha: "*RHEL-SAP-8.1.0*" rhel-8-2-sap-ha: "*RHEL-SAP-8.2.0*" rhel-8-4-sap-ha: "*RHEL-SAP-8.4.0*" rhel-8-6-sap-ha: "*RHEL-SAP-8.6.0*" rhel-8-8-sap-ha: "*RHEL-SAP-8.8.0*" + rhel-8-10-sap-ha: "*RHEL-SAP-8.10.0*" rhel-9-0-sap-ha: "*RHEL-SAP-9.0.0*" rhel-9-2-sap-ha: "*RHEL-SAP-9.2.0*" - sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" - sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" - sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" - sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + rhel-9-4-sap-ha: "*RHEL-SAP-9.4.0*" sles-12-5-sap-ha: "*suse-sles-sap-12-sp5-v202*-hvm-ssd-x86_64*" sles-15-1-sap-ha: "*suse-sles-sap-15-sp1-v202*-hvm-ssd-x86_64*" sles-15-2-sap-ha: "*suse-sles-sap-15-sp2-v202*-hvm-ssd-x86_64*" sles-15-3-sap-ha: "*suse-sles-sap-15-sp3-v202*-hvm-ssd-x86_64*" sles-15-4-sap-ha: "*suse-sles-sap-15-sp4-v202*-hvm-ssd-x86_64*" sles-15-5-sap-ha: "*suse-sles-sap-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha: "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" + sles-15-4-sap-ha-byos: "*suse-sles-sap-15-sp4-byos-v202*-hvm-ssd-x86_64*" + sles-15-5-sap-ha-byos: "*suse-sles-sap-15-sp5-byos-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha-byos: "*suse-sles-sap-15-sp6-byos-v202*-hvm-ssd-x86_64*" sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: @@ -244,42 +260,75 @@ sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: #### sap_vm_provision_gcp_ce_vm_host_os_image_dictionary: - rhel-8-latest: project: "rhel-cloud" family: "rhel-8" - - rhel-8-1-sap-ha: + rhel-9-latest: + project: "rhel-cloud" + family: "rhel-9" + sles-12-latest: + project: "suse-cloud" + family: "sles-12" + sles-15-latest: + project: "suse-cloud" + family: "sles-15" + # rhel-7-7-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-7-7-sap-ha" + rhel-7-9-sap-ha: project: "rhel-sap-cloud" - family: "rhel-8-1-sap-ha" - + family: "rhel-7-9-sap-ha" + # rhel-8-1-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-8-1-sap-ha" rhel-8-2-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-2-sap-ha" - rhel-8-4-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-4-sap-ha" - rhel-8-6-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-6-sap-ha" - - sles-15-latest: - project: "suse-cloud" - family: "sles-15" - - sles-15-sp3-sap: + sles-12-5-sap-ha: + project: "suse-sap-cloud" + family: "sles-12-sp5-sap" + # sles-15-1-sap-ha: # removed + # project: "suse-sap-cloud" + # family: "sles-15-sp1-sap" + sles-15-2-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp2-sap" + sles-15-3-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp3-sap" - - sles-15-sp4-sap: + sles-15-4-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp4-sap" - - sles-15-sp5-sap: + sles-15-5-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp5-sap" + sles-15-6-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp6-sap" + sles-12-5-sap-ha-byos: + project: "suse-byos-cloud" + family: "sles-12-sp5-sap-byos" + sles-15-2-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp2-sap-byos" + sles-15-3-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp3-sap-byos" + sles-15-4-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp4-sap-byos" + sles-15-5-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp5-sap-byos" + sles-15-6-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp6-sap-byos" sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: @@ -352,16 +401,31 @@ sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: sap_vm_provision_ibmcloud_vs_host_os_image_dictionary: rhel-8-4: ".*redhat.*8-4.*minimal.*amd64.*" rhel-8-6: ".*redhat.*8-6.*minimal.*amd64.*" + rhel-8-8: ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10: ".*redhat.*8-10.*minimal.*amd64.*" rhel-9-0: ".*redhat.*9-0.*minimal.*amd64.*" rhel-9-2: ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4: ".*redhat.*9-4.*minimal.*amd64.*" + sles-15-5: ".*sles.*15-5.*amd64-[0-9]" + sles-15-6: ".*sles.*15-6.*amd64-[0-9]" + # rhel-7-6-sap-ha: ".*redhat.*7-6.*amd64.*hana.*" # retrievable from deprecated list + # rhel-7-9-sap-ha: ".*redhat.*7-9.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-1-sap-ha: ".*redhat.*8-1.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-2-sap-ha: ".*redhat.*8-2.*amd64.*hana.*" # retrievable from deprecated list rhel-8-4-sap-ha: ".*redhat.*8-4.*amd64.*hana.*" rhel-8-6-sap-ha: ".*redhat.*8-6.*amd64.*hana.*" rhel-8-8-sap-ha: ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha: ".*redhat.*8-10.*amd64.*hana.*" rhel-9-0-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" - rhel-9-2-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha: ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha: ".*redhat.*9-4.*amd64.*hana.*" + # sles-12-4-sap-ha: ".*sles.*12-4.*amd64.*hana.*" # retrievable from deprecated list + # sles-12-5-sap-ha: ".*sles.*12-5.*amd64.*hana.*" # retrievable from deprecated list + # sles-15-1-sap-ha: ".*sles.*15-1.*amd64.*hana.*" # retrievable from deprecated list sles-15-3-sap-ha: ".*sles.*15-3.*amd64.*hana.*" sles-15-4-sap-ha: ".*sles.*15-4.*amd64.*hana.*" sles-15-5-sap-ha: ".*sles.*15-5.*amd64.*hana.*" + sles-15-6-sap-ha: ".*sles.*15-6.*amd64.*hana.*" sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: @@ -434,96 +498,186 @@ sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: #### sap_vm_provision_msazure_vm_host_os_image_dictionary: - + rhel-8-0: + publisher: "RedHat" + offer: "RHEL" + sku: "8-gen2" + rhel-8-1: + publisher: "RedHat" + offer: "RHEL" + sku: "81-gen2" + rhel-8-2: + publisher: "RedHat" + offer: "RHEL" + sku: "82-gen2" + rhel-8-3: + publisher: "RedHat" + offer: "RHEL" + sku: "83-gen2" rhel-8-4: publisher: "RedHat" offer: "RHEL" sku: "84-gen2" - + rhel-8-5: + publisher: "RedHat" + offer: "RHEL" + sku: "85-gen2" + rhel-8-6: + publisher: "RedHat" + offer: "RHEL" + sku: "86-gen2" + rhel-8-7: + publisher: "RedHat" + offer: "RHEL" + sku: "87-gen2" + rhel-8-8: + publisher: "RedHat" + offer: "RHEL" + sku: "88-gen2" + rhel-8-9: + publisher: "RedHat" + offer: "RHEL" + sku: "89-gen2" + rhel-8-10: + publisher: "RedHat" + offer: "RHEL" + sku: "810-gen2" + rhel-9-0: + publisher: "RedHat" + offer: "RHEL" + sku: "90-gen2" + rhel-9-1: + publisher: "RedHat" + offer: "RHEL" + sku: "91-gen2" + rhel-9-2: + publisher: "RedHat" + offer: "RHEL" + sku: "92-gen2" + rhel-9-3: + publisher: "RedHat" + offer: "RHEL" + sku: "93-gen2" + rhel-9-4: + publisher: "RedHat" + offer: "RHEL" + sku: "94-gen2" + sles-12-5: + publisher: "SUSE" + offer: "sles-12-sp5" + sku: "gen2" + sles-15-1: + publisher: "SUSE" + offer: "sles-15-sp1" + sku: "gen2" + sles-15-2: + publisher: "SUSE" + offer: "sles-15-sp2" + sku: "gen2" + sles-15-3: + publisher: "SUSE" + offer: "sles-15-sp3" + sku: "gen2" + sles-15-4: + publisher: "SUSE" + offer: "sles-15-sp4" + sku: "gen2" + sles-15-5: + publisher: "SUSE" + offer: "sles-15-sp5" + sku: "gen2" + sles-15-6: + publisher: "SUSE" + offer: "sles-15-sp6" + sku: "gen2" rhel-8-1-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "81sapha-gen2" - rhel-8-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "82sapha-gen2" - rhel-8-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "84sapha-gen2" - rhel-8-6-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "86sapha-gen2" - rhel-8-8-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "88sapha-gen2" - + rhel-8-10-sap-ha: + publisher: "RedHat" + offer: "RHEL-SAP-HA" + sku: "810sapha-gen2" rhel-9-0-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "90sapha-gen2" - rhel-9-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "92sapha-gen2" - - rhel-8-1-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "81sapapps-gen2" - - rhel-8-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "82sapapps-gen2" - - rhel-8-4-sap-applications: + rhel-9-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" - sku: "84sapapps-gen2" - - rhel-8-6-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "86sapapps-gen2" - - rhel-8-8-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "88sapapps-gen2" - - rhel-9-0-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "90sapapps-gen2" - - rhel-9-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "92sapapps-gen2" - - sles-15-sp3-sap: + sku: "94sapha-gen2" + sles-12-5-sap-ha: + publisher: "SUSE" + offer: "sles-sap-12-sp5" + sku: "gen2" + sles-15-1-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp1" + sku: "gen2" + sles-15-2-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp2" + sku: "gen2" + sles-15-3-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp3" sku: "gen2" - - sles-15-sp4-sap: + sles-15-4-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp4" sku: "gen2" - - sles-15-sp5-sap: + sles-15-5-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp5" sku: "gen2" + sles-15-6-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp6" + sku: "gen2" + sles-15-1-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp1-byos" + sku: "gen2" + sles-15-2-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp2-byos" + sku: "gen2" + sles-15-3-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp3-byos" + sku: "gen2" + sles-15-4-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp4-byos" + sku: "gen2" + sles-15-5-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp5-byos" + sku: "gen2" + sles-15-6-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp6-byos" + sku: "gen2" sap_vm_provision_msazure_vm_host_specifications_dictionary: diff --git a/deploy_scenarios/sap_ecc_sapase_sandbox/ansible_requirements.yml b/deploy_scenarios/sap_ecc_sapase_sandbox/ansible_requirements.yml index af7ed22..1454ec5 100644 --- a/deploy_scenarios/sap_ecc_sapase_sandbox/ansible_requirements.yml +++ b/deploy_scenarios/sap_ecc_sapase_sandbox/ansible_requirements.yml @@ -8,16 +8,16 @@ collections: version: 6.1.0 - name: fedora.linux_system_roles type: galaxy - version: 1.82.0 + version: 1.88.9 - name: community.sap_install type: galaxy - version: 1.4.0 + version: 1.5.0 - name: community.sap_launchpad type: galaxy - version: 1.1.0 + version: 1.1.1 - name: community.sap_infrastructure type: galaxy - version: 1.0.1 + version: 1.1.0 # - name: community.sap_operations # type: galaxy # version: 0.9.1 @@ -25,23 +25,23 @@ collections: # Collections for Infrastructure from Ansible Galaxy - name: cloud.terraform type: galaxy - version: 1.1.0 + version: 3.0.0 - name: amazon.aws type: galaxy - version: 7.2.0 + version: 9.0.0 - name: community.aws type: galaxy - version: 7.1.0 + version: 9.0.0 - name: azure.azcollection type: galaxy - version: 2.2.0 + version: 3.0.1 - name: google.cloud type: galaxy version: 1.1.3 # Replace with ibm.cloud in future, legacy Ansible Collection uses hidden on-the-fly Terraform files in /var/tmp/ansible/ibmcloud) - name: ibm.cloudcollection type: galaxy - version: 1.51.0 + version: 1.71.2 - name: ovirt.ovirt type: galaxy version: 3.1.2 @@ -53,21 +53,12 @@ collections: version: 3.0.0 - name: cloud.common type: galaxy - version: 3.0.0 + version: 4.0.0 # Collections from public repositories via HTTPS # - name: https://github.com/sap-linuxlab/community.sap_install.git # type: git # version: dev -# - name: https://github.com/sap-linuxlab/community.sap_launchpad.git -# type: git -# version: main -# - name: https://github.com/sap-linuxlab/community.sap_operations.git -# type: git -# version: main -# - name: https://github.com/ansible-collections/cloud.terraform.git -# type: git -# version: main # Collections from private repositories via use SSH (embedded GitHub PAT does not work) # Used for customised/forked Ansible Collections diff --git a/deploy_scenarios/sap_ecc_sapase_sandbox/optional/ansible_extravars_noninteractive.yml b/deploy_scenarios/sap_ecc_sapase_sandbox/optional/ansible_extravars_noninteractive.yml index e8ffbf1..de4d599 100755 --- a/deploy_scenarios/sap_ecc_sapase_sandbox/optional/ansible_extravars_noninteractive.yml +++ b/deploy_scenarios/sap_ecc_sapase_sandbox/optional/ansible_extravars_noninteractive.yml @@ -270,7 +270,7 @@ sap_id_user: "ENTER_STRING_VALUE_HERE" sap_id_user_password: 'ENTER_STRING_VALUE_HERE' # Directory for SAP installation media -sap_software_download_directory: "ENTER_STRING_VALUE_HERE" +sap_install_media_detect_source_directory: "ENTER_STRING_VALUE_HERE" # e.g. /software #### diff --git a/deploy_scenarios/sap_ecc_sapmaxdb_sandbox/ansible_extravars.yml b/deploy_scenarios/sap_ecc_sapmaxdb_sandbox/ansible_extravars.yml index da4a8c1..9806bff 100755 --- a/deploy_scenarios/sap_ecc_sapmaxdb_sandbox/ansible_extravars.yml +++ b/deploy_scenarios/sap_ecc_sapmaxdb_sandbox/ansible_extravars.yml @@ -156,27 +156,43 @@ sap_swpm_templates_install_dictionary: sap_vm_provision_aws_ec2_vs_host_os_image_dictionary: rhel-8-1: "*RHEL-8.1*_HVM*x86_64*" - rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" + # rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" # removed rhel-8-4: "*RHEL-8.4*_HVM*x86_64*" rhel-8-6: "*RHEL-8.6*_HVM*x86_64*" rhel-8-8: "*RHEL-8.8*_HVM*x86_64*" + rhel-8-10: "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0: "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1: "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2: "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3: "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4: "*RHEL-9.4*_HVM*x86_64*" + sles-12-5: "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" # removed + # sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" # removed + # sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" # removed + sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6: "*suse-sles-15-sp6-v202*-hvm-ssd-x86_64*" + # rhel-7-7-sap-ha: "*RHEL-SAP-8.1.0*" # removed + # rhel-7-9-sap-ha: "*RHEL-SAP-8.1.0*" # removed rhel-8-1-sap-ha: "*RHEL-SAP-8.1.0*" rhel-8-2-sap-ha: "*RHEL-SAP-8.2.0*" rhel-8-4-sap-ha: "*RHEL-SAP-8.4.0*" rhel-8-6-sap-ha: "*RHEL-SAP-8.6.0*" rhel-8-8-sap-ha: "*RHEL-SAP-8.8.0*" + rhel-8-10-sap-ha: "*RHEL-SAP-8.10.0*" rhel-9-0-sap-ha: "*RHEL-SAP-9.0.0*" rhel-9-2-sap-ha: "*RHEL-SAP-9.2.0*" - sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" - sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" - sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" - sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + rhel-9-4-sap-ha: "*RHEL-SAP-9.4.0*" sles-12-5-sap-ha: "*suse-sles-sap-12-sp5-v202*-hvm-ssd-x86_64*" sles-15-1-sap-ha: "*suse-sles-sap-15-sp1-v202*-hvm-ssd-x86_64*" sles-15-2-sap-ha: "*suse-sles-sap-15-sp2-v202*-hvm-ssd-x86_64*" sles-15-3-sap-ha: "*suse-sles-sap-15-sp3-v202*-hvm-ssd-x86_64*" sles-15-4-sap-ha: "*suse-sles-sap-15-sp4-v202*-hvm-ssd-x86_64*" sles-15-5-sap-ha: "*suse-sles-sap-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha: "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" + sles-15-4-sap-ha-byos: "*suse-sles-sap-15-sp4-byos-v202*-hvm-ssd-x86_64*" + sles-15-5-sap-ha-byos: "*suse-sles-sap-15-sp5-byos-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha-byos: "*suse-sles-sap-15-sp6-byos-v202*-hvm-ssd-x86_64*" sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: @@ -244,42 +260,75 @@ sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: #### sap_vm_provision_gcp_ce_vm_host_os_image_dictionary: - rhel-8-latest: project: "rhel-cloud" family: "rhel-8" - - rhel-8-1-sap-ha: + rhel-9-latest: + project: "rhel-cloud" + family: "rhel-9" + sles-12-latest: + project: "suse-cloud" + family: "sles-12" + sles-15-latest: + project: "suse-cloud" + family: "sles-15" + # rhel-7-7-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-7-7-sap-ha" + rhel-7-9-sap-ha: project: "rhel-sap-cloud" - family: "rhel-8-1-sap-ha" - + family: "rhel-7-9-sap-ha" + # rhel-8-1-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-8-1-sap-ha" rhel-8-2-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-2-sap-ha" - rhel-8-4-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-4-sap-ha" - rhel-8-6-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-6-sap-ha" - - sles-15-latest: - project: "suse-cloud" - family: "sles-15" - - sles-15-sp3-sap: + sles-12-5-sap-ha: + project: "suse-sap-cloud" + family: "sles-12-sp5-sap" + # sles-15-1-sap-ha: # removed + # project: "suse-sap-cloud" + # family: "sles-15-sp1-sap" + sles-15-2-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp2-sap" + sles-15-3-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp3-sap" - - sles-15-sp4-sap: + sles-15-4-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp4-sap" - - sles-15-sp5-sap: + sles-15-5-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp5-sap" + sles-15-6-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp6-sap" + sles-12-5-sap-ha-byos: + project: "suse-byos-cloud" + family: "sles-12-sp5-sap-byos" + sles-15-2-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp2-sap-byos" + sles-15-3-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp3-sap-byos" + sles-15-4-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp4-sap-byos" + sles-15-5-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp5-sap-byos" + sles-15-6-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp6-sap-byos" sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: @@ -351,16 +400,31 @@ sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: sap_vm_provision_ibmcloud_vs_host_os_image_dictionary: rhel-8-4: ".*redhat.*8-4.*minimal.*amd64.*" rhel-8-6: ".*redhat.*8-6.*minimal.*amd64.*" + rhel-8-8: ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10: ".*redhat.*8-10.*minimal.*amd64.*" rhel-9-0: ".*redhat.*9-0.*minimal.*amd64.*" rhel-9-2: ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4: ".*redhat.*9-4.*minimal.*amd64.*" + sles-15-5: ".*sles.*15-5.*amd64-[0-9]" + sles-15-6: ".*sles.*15-6.*amd64-[0-9]" + # rhel-7-6-sap-ha: ".*redhat.*7-6.*amd64.*hana.*" # retrievable from deprecated list + # rhel-7-9-sap-ha: ".*redhat.*7-9.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-1-sap-ha: ".*redhat.*8-1.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-2-sap-ha: ".*redhat.*8-2.*amd64.*hana.*" # retrievable from deprecated list rhel-8-4-sap-ha: ".*redhat.*8-4.*amd64.*hana.*" rhel-8-6-sap-ha: ".*redhat.*8-6.*amd64.*hana.*" rhel-8-8-sap-ha: ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha: ".*redhat.*8-10.*amd64.*hana.*" rhel-9-0-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" - rhel-9-2-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha: ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha: ".*redhat.*9-4.*amd64.*hana.*" + # sles-12-4-sap-ha: ".*sles.*12-4.*amd64.*hana.*" # retrievable from deprecated list + # sles-12-5-sap-ha: ".*sles.*12-5.*amd64.*hana.*" # retrievable from deprecated list + # sles-15-1-sap-ha: ".*sles.*15-1.*amd64.*hana.*" # retrievable from deprecated list sles-15-3-sap-ha: ".*sles.*15-3.*amd64.*hana.*" sles-15-4-sap-ha: ".*sles.*15-4.*amd64.*hana.*" sles-15-5-sap-ha: ".*sles.*15-5.*amd64.*hana.*" + sles-15-6-sap-ha: ".*sles.*15-6.*amd64.*hana.*" sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: @@ -433,96 +497,186 @@ sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: #### sap_vm_provision_msazure_vm_host_os_image_dictionary: - + rhel-8-0: + publisher: "RedHat" + offer: "RHEL" + sku: "8-gen2" + rhel-8-1: + publisher: "RedHat" + offer: "RHEL" + sku: "81-gen2" + rhel-8-2: + publisher: "RedHat" + offer: "RHEL" + sku: "82-gen2" + rhel-8-3: + publisher: "RedHat" + offer: "RHEL" + sku: "83-gen2" rhel-8-4: publisher: "RedHat" offer: "RHEL" sku: "84-gen2" - + rhel-8-5: + publisher: "RedHat" + offer: "RHEL" + sku: "85-gen2" + rhel-8-6: + publisher: "RedHat" + offer: "RHEL" + sku: "86-gen2" + rhel-8-7: + publisher: "RedHat" + offer: "RHEL" + sku: "87-gen2" + rhel-8-8: + publisher: "RedHat" + offer: "RHEL" + sku: "88-gen2" + rhel-8-9: + publisher: "RedHat" + offer: "RHEL" + sku: "89-gen2" + rhel-8-10: + publisher: "RedHat" + offer: "RHEL" + sku: "810-gen2" + rhel-9-0: + publisher: "RedHat" + offer: "RHEL" + sku: "90-gen2" + rhel-9-1: + publisher: "RedHat" + offer: "RHEL" + sku: "91-gen2" + rhel-9-2: + publisher: "RedHat" + offer: "RHEL" + sku: "92-gen2" + rhel-9-3: + publisher: "RedHat" + offer: "RHEL" + sku: "93-gen2" + rhel-9-4: + publisher: "RedHat" + offer: "RHEL" + sku: "94-gen2" + sles-12-5: + publisher: "SUSE" + offer: "sles-12-sp5" + sku: "gen2" + sles-15-1: + publisher: "SUSE" + offer: "sles-15-sp1" + sku: "gen2" + sles-15-2: + publisher: "SUSE" + offer: "sles-15-sp2" + sku: "gen2" + sles-15-3: + publisher: "SUSE" + offer: "sles-15-sp3" + sku: "gen2" + sles-15-4: + publisher: "SUSE" + offer: "sles-15-sp4" + sku: "gen2" + sles-15-5: + publisher: "SUSE" + offer: "sles-15-sp5" + sku: "gen2" + sles-15-6: + publisher: "SUSE" + offer: "sles-15-sp6" + sku: "gen2" rhel-8-1-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "81sapha-gen2" - rhel-8-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "82sapha-gen2" - rhel-8-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "84sapha-gen2" - rhel-8-6-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "86sapha-gen2" - rhel-8-8-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "88sapha-gen2" - + rhel-8-10-sap-ha: + publisher: "RedHat" + offer: "RHEL-SAP-HA" + sku: "810sapha-gen2" rhel-9-0-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "90sapha-gen2" - rhel-9-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "92sapha-gen2" - - rhel-8-1-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "81sapapps-gen2" - - rhel-8-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "82sapapps-gen2" - - rhel-8-4-sap-applications: + rhel-9-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" - sku: "84sapapps-gen2" - - rhel-8-6-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "86sapapps-gen2" - - rhel-8-8-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "88sapapps-gen2" - - rhel-9-0-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "90sapapps-gen2" - - rhel-9-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "92sapapps-gen2" - - sles-15-sp3-sap: + sku: "94sapha-gen2" + sles-12-5-sap-ha: + publisher: "SUSE" + offer: "sles-sap-12-sp5" + sku: "gen2" + sles-15-1-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp1" + sku: "gen2" + sles-15-2-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp2" + sku: "gen2" + sles-15-3-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp3" sku: "gen2" - - sles-15-sp4-sap: + sles-15-4-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp4" sku: "gen2" - - sles-15-sp5-sap: + sles-15-5-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp5" sku: "gen2" + sles-15-6-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp6" + sku: "gen2" + sles-15-1-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp1-byos" + sku: "gen2" + sles-15-2-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp2-byos" + sku: "gen2" + sles-15-3-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp3-byos" + sku: "gen2" + sles-15-4-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp4-byos" + sku: "gen2" + sles-15-5-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp5-byos" + sku: "gen2" + sles-15-6-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp6-byos" + sku: "gen2" sap_vm_provision_msazure_vm_host_specifications_dictionary: diff --git a/deploy_scenarios/sap_ecc_sapmaxdb_sandbox/ansible_requirements.yml b/deploy_scenarios/sap_ecc_sapmaxdb_sandbox/ansible_requirements.yml index af7ed22..1454ec5 100644 --- a/deploy_scenarios/sap_ecc_sapmaxdb_sandbox/ansible_requirements.yml +++ b/deploy_scenarios/sap_ecc_sapmaxdb_sandbox/ansible_requirements.yml @@ -8,16 +8,16 @@ collections: version: 6.1.0 - name: fedora.linux_system_roles type: galaxy - version: 1.82.0 + version: 1.88.9 - name: community.sap_install type: galaxy - version: 1.4.0 + version: 1.5.0 - name: community.sap_launchpad type: galaxy - version: 1.1.0 + version: 1.1.1 - name: community.sap_infrastructure type: galaxy - version: 1.0.1 + version: 1.1.0 # - name: community.sap_operations # type: galaxy # version: 0.9.1 @@ -25,23 +25,23 @@ collections: # Collections for Infrastructure from Ansible Galaxy - name: cloud.terraform type: galaxy - version: 1.1.0 + version: 3.0.0 - name: amazon.aws type: galaxy - version: 7.2.0 + version: 9.0.0 - name: community.aws type: galaxy - version: 7.1.0 + version: 9.0.0 - name: azure.azcollection type: galaxy - version: 2.2.0 + version: 3.0.1 - name: google.cloud type: galaxy version: 1.1.3 # Replace with ibm.cloud in future, legacy Ansible Collection uses hidden on-the-fly Terraform files in /var/tmp/ansible/ibmcloud) - name: ibm.cloudcollection type: galaxy - version: 1.51.0 + version: 1.71.2 - name: ovirt.ovirt type: galaxy version: 3.1.2 @@ -53,21 +53,12 @@ collections: version: 3.0.0 - name: cloud.common type: galaxy - version: 3.0.0 + version: 4.0.0 # Collections from public repositories via HTTPS # - name: https://github.com/sap-linuxlab/community.sap_install.git # type: git # version: dev -# - name: https://github.com/sap-linuxlab/community.sap_launchpad.git -# type: git -# version: main -# - name: https://github.com/sap-linuxlab/community.sap_operations.git -# type: git -# version: main -# - name: https://github.com/ansible-collections/cloud.terraform.git -# type: git -# version: main # Collections from private repositories via use SSH (embedded GitHub PAT does not work) # Used for customised/forked Ansible Collections diff --git a/deploy_scenarios/sap_ecc_sapmaxdb_sandbox/optional/ansible_extravars_noninteractive.yml b/deploy_scenarios/sap_ecc_sapmaxdb_sandbox/optional/ansible_extravars_noninteractive.yml index 967ab67..8cbda07 100755 --- a/deploy_scenarios/sap_ecc_sapmaxdb_sandbox/optional/ansible_extravars_noninteractive.yml +++ b/deploy_scenarios/sap_ecc_sapmaxdb_sandbox/optional/ansible_extravars_noninteractive.yml @@ -270,7 +270,7 @@ sap_id_user: "ENTER_STRING_VALUE_HERE" sap_id_user_password: 'ENTER_STRING_VALUE_HERE' # Directory for SAP installation media -sap_software_download_directory: "ENTER_STRING_VALUE_HERE" +sap_install_media_detect_source_directory: "ENTER_STRING_VALUE_HERE" # e.g. /software #### diff --git a/deploy_scenarios/sap_hana/ansible_extravars.yml b/deploy_scenarios/sap_hana/ansible_extravars.yml index 53e7102..90825a9 100755 --- a/deploy_scenarios/sap_hana/ansible_extravars.yml +++ b/deploy_scenarios/sap_hana/ansible_extravars.yml @@ -57,8 +57,8 @@ sap_hana_install_media_dictionary: softwarecenter_search_list_saphana_ppc64le: - 'SAPCAR_1115-70006238.EXE' - - 'IMDB_SERVER20_077_0-80002031.SAR' - - 'SAPHOSTAGENT62_62-80004822.SAR' # SAP Host Agent 7.22 + - 'IMDB_SERVER20_077_0-80002046.SAR' + - 'SAPHOSTAGENT62_62-80004831.SAR' # SAP Host Agent 7.22 sap_hana_2_sps06_install: @@ -126,27 +126,43 @@ sap_hana_install_update_etchosts: 'false' sap_vm_provision_aws_ec2_vs_host_os_image_dictionary: rhel-8-1: "*RHEL-8.1*_HVM*x86_64*" - rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" + # rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" # removed rhel-8-4: "*RHEL-8.4*_HVM*x86_64*" rhel-8-6: "*RHEL-8.6*_HVM*x86_64*" rhel-8-8: "*RHEL-8.8*_HVM*x86_64*" + rhel-8-10: "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0: "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1: "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2: "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3: "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4: "*RHEL-9.4*_HVM*x86_64*" + sles-12-5: "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" # removed + # sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" # removed + # sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" # removed + sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6: "*suse-sles-15-sp6-v202*-hvm-ssd-x86_64*" + # rhel-7-7-sap-ha: "*RHEL-SAP-8.1.0*" # removed + # rhel-7-9-sap-ha: "*RHEL-SAP-8.1.0*" # removed rhel-8-1-sap-ha: "*RHEL-SAP-8.1.0*" rhel-8-2-sap-ha: "*RHEL-SAP-8.2.0*" rhel-8-4-sap-ha: "*RHEL-SAP-8.4.0*" rhel-8-6-sap-ha: "*RHEL-SAP-8.6.0*" rhel-8-8-sap-ha: "*RHEL-SAP-8.8.0*" + rhel-8-10-sap-ha: "*RHEL-SAP-8.10.0*" rhel-9-0-sap-ha: "*RHEL-SAP-9.0.0*" rhel-9-2-sap-ha: "*RHEL-SAP-9.2.0*" - sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" - sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" - sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" - sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + rhel-9-4-sap-ha: "*RHEL-SAP-9.4.0*" sles-12-5-sap-ha: "*suse-sles-sap-12-sp5-v202*-hvm-ssd-x86_64*" sles-15-1-sap-ha: "*suse-sles-sap-15-sp1-v202*-hvm-ssd-x86_64*" sles-15-2-sap-ha: "*suse-sles-sap-15-sp2-v202*-hvm-ssd-x86_64*" sles-15-3-sap-ha: "*suse-sles-sap-15-sp3-v202*-hvm-ssd-x86_64*" sles-15-4-sap-ha: "*suse-sles-sap-15-sp4-v202*-hvm-ssd-x86_64*" sles-15-5-sap-ha: "*suse-sles-sap-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha: "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" + sles-15-4-sap-ha-byos: "*suse-sles-sap-15-sp4-byos-v202*-hvm-ssd-x86_64*" + sles-15-5-sap-ha-byos: "*suse-sles-sap-15-sp5-byos-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha-byos: "*suse-sles-sap-15-sp6-byos-v202*-hvm-ssd-x86_64*" sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: @@ -214,42 +230,75 @@ sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: #### sap_vm_provision_gcp_ce_vm_host_os_image_dictionary: - rhel-8-latest: project: "rhel-cloud" family: "rhel-8" - - rhel-8-1-sap-ha: + rhel-9-latest: + project: "rhel-cloud" + family: "rhel-9" + sles-12-latest: + project: "suse-cloud" + family: "sles-12" + sles-15-latest: + project: "suse-cloud" + family: "sles-15" + # rhel-7-7-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-7-7-sap-ha" + rhel-7-9-sap-ha: project: "rhel-sap-cloud" - family: "rhel-8-1-sap-ha" - + family: "rhel-7-9-sap-ha" + # rhel-8-1-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-8-1-sap-ha" rhel-8-2-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-2-sap-ha" - rhel-8-4-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-4-sap-ha" - rhel-8-6-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-6-sap-ha" - - sles-15-latest: - project: "suse-cloud" - family: "sles-15" - - sles-15-sp3-sap: + sles-12-5-sap-ha: + project: "suse-sap-cloud" + family: "sles-12-sp5-sap" + # sles-15-1-sap-ha: # removed + # project: "suse-sap-cloud" + # family: "sles-15-sp1-sap" + sles-15-2-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp2-sap" + sles-15-3-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp3-sap" - - sles-15-sp4-sap: + sles-15-4-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp4-sap" - - sles-15-sp5-sap: + sles-15-5-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp5-sap" + sles-15-6-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp6-sap" + sles-12-5-sap-ha-byos: + project: "suse-byos-cloud" + family: "sles-12-sp5-sap-byos" + sles-15-2-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp2-sap-byos" + sles-15-3-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp3-sap-byos" + sles-15-4-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp4-sap-byos" + sles-15-5-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp5-sap-byos" + sles-15-6-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp6-sap-byos" sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: @@ -324,16 +373,31 @@ sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: sap_vm_provision_ibmcloud_vs_host_os_image_dictionary: rhel-8-4: ".*redhat.*8-4.*minimal.*amd64.*" rhel-8-6: ".*redhat.*8-6.*minimal.*amd64.*" + rhel-8-8: ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10: ".*redhat.*8-10.*minimal.*amd64.*" rhel-9-0: ".*redhat.*9-0.*minimal.*amd64.*" rhel-9-2: ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4: ".*redhat.*9-4.*minimal.*amd64.*" + sles-15-5: ".*sles.*15-5.*amd64-[0-9]" + sles-15-6: ".*sles.*15-6.*amd64-[0-9]" + # rhel-7-6-sap-ha: ".*redhat.*7-6.*amd64.*hana.*" # retrievable from deprecated list + # rhel-7-9-sap-ha: ".*redhat.*7-9.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-1-sap-ha: ".*redhat.*8-1.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-2-sap-ha: ".*redhat.*8-2.*amd64.*hana.*" # retrievable from deprecated list rhel-8-4-sap-ha: ".*redhat.*8-4.*amd64.*hana.*" rhel-8-6-sap-ha: ".*redhat.*8-6.*amd64.*hana.*" rhel-8-8-sap-ha: ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha: ".*redhat.*8-10.*amd64.*hana.*" rhel-9-0-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" - rhel-9-2-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha: ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha: ".*redhat.*9-4.*amd64.*hana.*" + # sles-12-4-sap-ha: ".*sles.*12-4.*amd64.*hana.*" # retrievable from deprecated list + # sles-12-5-sap-ha: ".*sles.*12-5.*amd64.*hana.*" # retrievable from deprecated list + # sles-15-1-sap-ha: ".*sles.*15-1.*amd64.*hana.*" # retrievable from deprecated list sles-15-3-sap-ha: ".*sles.*15-3.*amd64.*hana.*" sles-15-4-sap-ha: ".*sles.*15-4.*amd64.*hana.*" sles-15-5-sap-ha: ".*sles.*15-5.*amd64.*hana.*" + sles-15-6-sap-ha: ".*sles.*15-6.*amd64.*hana.*" sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: @@ -407,17 +471,26 @@ sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: # Full Linux subscription ppc64le OS Images with support and activation keys sap_vm_provision_ibmcloud_powervs_host_os_image_dictionary: - rhel-8-4: ".*RHEL.*8.*4" - rhel-8-6: ".*RHEL.*8.*6" + rhel-8-8: ".*RHEL.*8.*8" rhel-9-2: ".*RHEL.*9.*2" - sles-15-3: ".*SLES.*15.*3" - sles-15-4: ".*SLES.*15.*4" + rhel-9-4: ".*RHEL.*9.*4" + sles-15-5: ".*SLES.*15.*5$" + rhel-8-4-sap-ha: "RHEL8-SP4-SAP" rhel-8-6-sap-ha: ".*RHEL.*8.*6.*SAP$" # ensure string suffix using $ rhel-8-8-sap-ha: ".*RHEL.*8.*8.*SAP$" # ensure string suffix using $ rhel-9-2-sap-ha: ".*RHEL.*9.*2.*SAP$" # ensure string suffix using $ sles-15-2-sap-ha: ".*SLES.*15.*2.*SAP$" # ensure string suffix using $ sles-15-3-sap-ha: ".*SLES.*15.*3.*SAP$" # ensure string suffix using $ sles-15-4-sap-ha: ".*SLES.*15.*4.*SAP$" # ensure string suffix using $ + sles-15-5-sap-ha: "SLES15-SP5-SAP" + # rhel-8-4-sap-ha-byol: "RHEL8-SP4-SAP-BYOL" + # rhel-8-6-sap-ha-byol: ".*RHEL.*8.*6.*SAP-BYOL$" # ensure string suffix using $ + # rhel-8-8-sap-ha-byol: ".*RHEL.*8.*8.*SAP-BYOL$" # ensure string suffix using $ + # rhel-9-2-sap-ha-byol: ".*RHEL.*9.*2.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-2-sap-ha-byol: ".*SLES.*15.*2.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-3-sap-ha-byol: ".*SLES.*15.*3.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-4-sap-ha-byol: ".*SLES.*15.*4.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-5-sap-ha-byol: "SLES15-SP5-SAP-BYOL" sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: @@ -490,96 +563,186 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: #### sap_vm_provision_msazure_vm_host_os_image_dictionary: - + rhel-8-0: + publisher: "RedHat" + offer: "RHEL" + sku: "8-gen2" + rhel-8-1: + publisher: "RedHat" + offer: "RHEL" + sku: "81-gen2" + rhel-8-2: + publisher: "RedHat" + offer: "RHEL" + sku: "82-gen2" + rhel-8-3: + publisher: "RedHat" + offer: "RHEL" + sku: "83-gen2" rhel-8-4: publisher: "RedHat" offer: "RHEL" sku: "84-gen2" - + rhel-8-5: + publisher: "RedHat" + offer: "RHEL" + sku: "85-gen2" + rhel-8-6: + publisher: "RedHat" + offer: "RHEL" + sku: "86-gen2" + rhel-8-7: + publisher: "RedHat" + offer: "RHEL" + sku: "87-gen2" + rhel-8-8: + publisher: "RedHat" + offer: "RHEL" + sku: "88-gen2" + rhel-8-9: + publisher: "RedHat" + offer: "RHEL" + sku: "89-gen2" + rhel-8-10: + publisher: "RedHat" + offer: "RHEL" + sku: "810-gen2" + rhel-9-0: + publisher: "RedHat" + offer: "RHEL" + sku: "90-gen2" + rhel-9-1: + publisher: "RedHat" + offer: "RHEL" + sku: "91-gen2" + rhel-9-2: + publisher: "RedHat" + offer: "RHEL" + sku: "92-gen2" + rhel-9-3: + publisher: "RedHat" + offer: "RHEL" + sku: "93-gen2" + rhel-9-4: + publisher: "RedHat" + offer: "RHEL" + sku: "94-gen2" + sles-12-5: + publisher: "SUSE" + offer: "sles-12-sp5" + sku: "gen2" + sles-15-1: + publisher: "SUSE" + offer: "sles-15-sp1" + sku: "gen2" + sles-15-2: + publisher: "SUSE" + offer: "sles-15-sp2" + sku: "gen2" + sles-15-3: + publisher: "SUSE" + offer: "sles-15-sp3" + sku: "gen2" + sles-15-4: + publisher: "SUSE" + offer: "sles-15-sp4" + sku: "gen2" + sles-15-5: + publisher: "SUSE" + offer: "sles-15-sp5" + sku: "gen2" + sles-15-6: + publisher: "SUSE" + offer: "sles-15-sp6" + sku: "gen2" rhel-8-1-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "81sapha-gen2" - rhel-8-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "82sapha-gen2" - rhel-8-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "84sapha-gen2" - rhel-8-6-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "86sapha-gen2" - rhel-8-8-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "88sapha-gen2" - + rhel-8-10-sap-ha: + publisher: "RedHat" + offer: "RHEL-SAP-HA" + sku: "810sapha-gen2" rhel-9-0-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "90sapha-gen2" - rhel-9-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "92sapha-gen2" - - rhel-8-1-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "81sapapps-gen2" - - rhel-8-2-sap-applications: + rhel-9-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" - sku: "82sapapps-gen2" - - rhel-8-4-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "84sapapps-gen2" - - rhel-8-6-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "86sapapps-gen2" - - rhel-8-8-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "88sapapps-gen2" - - rhel-9-0-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "90sapapps-gen2" - - rhel-9-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "92sapapps-gen2" - - sles-15-sp3-sap: + sku: "94sapha-gen2" + sles-12-5-sap-ha: + publisher: "SUSE" + offer: "sles-sap-12-sp5" + sku: "gen2" + sles-15-1-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp1" + sku: "gen2" + sles-15-2-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp2" + sku: "gen2" + sles-15-3-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp3" sku: "gen2" - - sles-15-sp4-sap: + sles-15-4-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp4" sku: "gen2" - - sles-15-sp5-sap: + sles-15-5-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp5" sku: "gen2" + sles-15-6-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp6" + sku: "gen2" + sles-15-1-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp1-byos" + sku: "gen2" + sles-15-2-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp2-byos" + sku: "gen2" + sles-15-3-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp3-byos" + sku: "gen2" + sles-15-4-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp4-byos" + sku: "gen2" + sles-15-5-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp5-byos" + sku: "gen2" + sles-15-6-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp6-byos" + sku: "gen2" sap_vm_provision_msazure_vm_host_specifications_dictionary: diff --git a/deploy_scenarios/sap_hana/ansible_requirements.yml b/deploy_scenarios/sap_hana/ansible_requirements.yml index af7ed22..1454ec5 100644 --- a/deploy_scenarios/sap_hana/ansible_requirements.yml +++ b/deploy_scenarios/sap_hana/ansible_requirements.yml @@ -8,16 +8,16 @@ collections: version: 6.1.0 - name: fedora.linux_system_roles type: galaxy - version: 1.82.0 + version: 1.88.9 - name: community.sap_install type: galaxy - version: 1.4.0 + version: 1.5.0 - name: community.sap_launchpad type: galaxy - version: 1.1.0 + version: 1.1.1 - name: community.sap_infrastructure type: galaxy - version: 1.0.1 + version: 1.1.0 # - name: community.sap_operations # type: galaxy # version: 0.9.1 @@ -25,23 +25,23 @@ collections: # Collections for Infrastructure from Ansible Galaxy - name: cloud.terraform type: galaxy - version: 1.1.0 + version: 3.0.0 - name: amazon.aws type: galaxy - version: 7.2.0 + version: 9.0.0 - name: community.aws type: galaxy - version: 7.1.0 + version: 9.0.0 - name: azure.azcollection type: galaxy - version: 2.2.0 + version: 3.0.1 - name: google.cloud type: galaxy version: 1.1.3 # Replace with ibm.cloud in future, legacy Ansible Collection uses hidden on-the-fly Terraform files in /var/tmp/ansible/ibmcloud) - name: ibm.cloudcollection type: galaxy - version: 1.51.0 + version: 1.71.2 - name: ovirt.ovirt type: galaxy version: 3.1.2 @@ -53,21 +53,12 @@ collections: version: 3.0.0 - name: cloud.common type: galaxy - version: 3.0.0 + version: 4.0.0 # Collections from public repositories via HTTPS # - name: https://github.com/sap-linuxlab/community.sap_install.git # type: git # version: dev -# - name: https://github.com/sap-linuxlab/community.sap_launchpad.git -# type: git -# version: main -# - name: https://github.com/sap-linuxlab/community.sap_operations.git -# type: git -# version: main -# - name: https://github.com/ansible-collections/cloud.terraform.git -# type: git -# version: main # Collections from private repositories via use SSH (embedded GitHub PAT does not work) # Used for customised/forked Ansible Collections diff --git a/deploy_scenarios/sap_hana/optional/ansible_extravars_noninteractive.yml b/deploy_scenarios/sap_hana/optional/ansible_extravars_noninteractive.yml index 1a37b3d..ecc69da 100755 --- a/deploy_scenarios/sap_hana/optional/ansible_extravars_noninteractive.yml +++ b/deploy_scenarios/sap_hana/optional/ansible_extravars_noninteractive.yml @@ -110,13 +110,14 @@ sap_vm_provision_ibmcloud_vpc_sg_names: "ENTER_STRING_VALUE_HERE,ENTER_STRING_VA #### sap_vm_provision_ibmcloud_api_key: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ibmcloud_resource_group_name: "ENTER_STRING_VALUE_HERE" # if ansible_to_terraform, use "new" -sap_vm_provision_ibmcloud_private_dns_instance_name: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_private_dns_instance_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform sap_vm_provision_ibmcloud_powervs_location: "ENTER_STRING_VALUE_HERE" -sap_vm_provision_ibmcloud_powervs_workspace_name: "ENTER_STRING_VALUE_HERE" -sap_vm_provision_ibmcloud_powervs_vlan_subnet_name: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_powervs_workspace_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform +sap_vm_provision_ibmcloud_powervs_vlan_subnet_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform sap_vm_provision_ibmcloud_powervs_host_os_image: "ENTER_STRING_VALUE_HERE" sap_vm_provision_bastion_user: "ENTER_STRING_VALUE_HERE" sap_vm_provision_bastion_ssh_port: "ENTER_STRING_VALUE_HERE" +# sap_vm_provision_ibmcloud_vpc_subnet_name: "ENTER_STRING_VALUE_HERE" # only for ansible_to_terraform, can be name or 'new' # Only for use when 'ansible' is value provided for variable sap_vm_provision_iac_type #### @@ -124,6 +125,7 @@ sap_vm_provision_bastion_public_ip: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ssh_bastion_private_key_file_path: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ssh_host_private_key_file_path: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ibmcloud_powervs_key_pair_name_ssh_host_public_key: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_private_dns_custom_resolver_ip: "ENTER_STRING_VALUE_HERE" # sap_vm_provision_ibmcloud_private_dns_resource_group_name: "" # optional, default use of sap_vm_provision_ibmcloud_resource_group_name sap_vm_provision_proxy_web_forward_proxy_ip: "ENTER_STRING_VALUE_HERE" # IP:Port only, no http:// prefix sap_vm_provision_proxy_web_forward_exclusions: "localhost,127.0.0.1,{{ sap_vm_provision_dns_root_domain }}" @@ -348,7 +350,7 @@ sap_id_user: "ENTER_STRING_VALUE_HERE" sap_id_user_password: 'ENTER_STRING_VALUE_HERE' # Directory for SAP installation media -sap_software_download_directory: "ENTER_STRING_VALUE_HERE" +sap_install_media_detect_source_directory: "ENTER_STRING_VALUE_HERE" # e.g. /software #### diff --git a/deploy_scenarios/sap_hana_ha/ansible_extravars.yml b/deploy_scenarios/sap_hana_ha/ansible_extravars.yml index 50e6db2..213c841 100755 --- a/deploy_scenarios/sap_hana_ha/ansible_extravars.yml +++ b/deploy_scenarios/sap_hana_ha/ansible_extravars.yml @@ -67,8 +67,8 @@ sap_hana_install_media_dictionary: softwarecenter_search_list_saphana_ppc64le: - 'SAPCAR_1115-70006238.EXE' - - 'IMDB_SERVER20_077_0-80002031.SAR' - - 'SAPHOSTAGENT62_62-80004822.SAR' # SAP Host Agent 7.22 + - 'IMDB_SERVER20_077_0-80002046.SAR' + - 'SAPHOSTAGENT62_62-80004831.SAR' # SAP Host Agent 7.22 sap_hana_2_sps06_install: @@ -124,7 +124,7 @@ sap_hana_install_media_dictionary: #### # Mandatory parameters : Virtual IPs (VIPs) #### -#sap_ha_pacemaker_cluster_vip_hana_primary_ip_address: "SET_IN_VAR_PROMPT" +#sap_vm_provision_ha_vip_hana_primary: "SET_IN_VAR_PROMPT" #### @@ -194,27 +194,43 @@ sap_hana_install_media_dictionary_regex: sap_vm_provision_aws_ec2_vs_host_os_image_dictionary: rhel-8-1: "*RHEL-8.1*_HVM*x86_64*" - rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" + # rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" # removed rhel-8-4: "*RHEL-8.4*_HVM*x86_64*" rhel-8-6: "*RHEL-8.6*_HVM*x86_64*" rhel-8-8: "*RHEL-8.8*_HVM*x86_64*" + rhel-8-10: "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0: "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1: "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2: "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3: "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4: "*RHEL-9.4*_HVM*x86_64*" + sles-12-5: "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" # removed + # sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" # removed + # sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" # removed + sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6: "*suse-sles-15-sp6-v202*-hvm-ssd-x86_64*" + # rhel-7-7-sap-ha: "*RHEL-SAP-8.1.0*" # removed + # rhel-7-9-sap-ha: "*RHEL-SAP-8.1.0*" # removed rhel-8-1-sap-ha: "*RHEL-SAP-8.1.0*" rhel-8-2-sap-ha: "*RHEL-SAP-8.2.0*" rhel-8-4-sap-ha: "*RHEL-SAP-8.4.0*" rhel-8-6-sap-ha: "*RHEL-SAP-8.6.0*" rhel-8-8-sap-ha: "*RHEL-SAP-8.8.0*" + rhel-8-10-sap-ha: "*RHEL-SAP-8.10.0*" rhel-9-0-sap-ha: "*RHEL-SAP-9.0.0*" rhel-9-2-sap-ha: "*RHEL-SAP-9.2.0*" - sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" - sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" - sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" - sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + rhel-9-4-sap-ha: "*RHEL-SAP-9.4.0*" sles-12-5-sap-ha: "*suse-sles-sap-12-sp5-v202*-hvm-ssd-x86_64*" sles-15-1-sap-ha: "*suse-sles-sap-15-sp1-v202*-hvm-ssd-x86_64*" sles-15-2-sap-ha: "*suse-sles-sap-15-sp2-v202*-hvm-ssd-x86_64*" sles-15-3-sap-ha: "*suse-sles-sap-15-sp3-v202*-hvm-ssd-x86_64*" sles-15-4-sap-ha: "*suse-sles-sap-15-sp4-v202*-hvm-ssd-x86_64*" sles-15-5-sap-ha: "*suse-sles-sap-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha: "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" + sles-15-4-sap-ha-byos: "*suse-sles-sap-15-sp4-byos-v202*-hvm-ssd-x86_64*" + sles-15-5-sap-ha-byos: "*suse-sles-sap-15-sp5-byos-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha-byos: "*suse-sles-sap-15-sp6-byos-v202*-hvm-ssd-x86_64*" sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: @@ -324,42 +340,75 @@ sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: #### sap_vm_provision_gcp_ce_vm_host_os_image_dictionary: - rhel-8-latest: project: "rhel-cloud" family: "rhel-8" - - rhel-8-1-sap-ha: + rhel-9-latest: + project: "rhel-cloud" + family: "rhel-9" + sles-12-latest: + project: "suse-cloud" + family: "sles-12" + sles-15-latest: + project: "suse-cloud" + family: "sles-15" + # rhel-7-7-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-7-7-sap-ha" + rhel-7-9-sap-ha: project: "rhel-sap-cloud" - family: "rhel-8-1-sap-ha" - + family: "rhel-7-9-sap-ha" + # rhel-8-1-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-8-1-sap-ha" rhel-8-2-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-2-sap-ha" - rhel-8-4-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-4-sap-ha" - rhel-8-6-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-6-sap-ha" - - sles-15-latest: - project: "suse-cloud" - family: "sles-15" - - sles-15-sp3-sap: + sles-12-5-sap-ha: + project: "suse-sap-cloud" + family: "sles-12-sp5-sap" + # sles-15-1-sap-ha: # removed + # project: "suse-sap-cloud" + # family: "sles-15-sp1-sap" + sles-15-2-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp2-sap" + sles-15-3-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp3-sap" - - sles-15-sp4-sap: + sles-15-4-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp4-sap" - - sles-15-sp5-sap: + sles-15-5-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp5-sap" + sles-15-6-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp6-sap" + sles-12-5-sap-ha-byos: + project: "suse-byos-cloud" + family: "sles-12-sp5-sap-byos" + sles-15-2-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp2-sap-byos" + sles-15-3-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp3-sap-byos" + sles-15-4-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp4-sap-byos" + sles-15-5-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp5-sap-byos" + sles-15-6-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp6-sap-byos" sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: @@ -494,16 +543,31 @@ sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: sap_vm_provision_ibmcloud_vs_host_os_image_dictionary: rhel-8-4: ".*redhat.*8-4.*minimal.*amd64.*" rhel-8-6: ".*redhat.*8-6.*minimal.*amd64.*" + rhel-8-8: ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10: ".*redhat.*8-10.*minimal.*amd64.*" rhel-9-0: ".*redhat.*9-0.*minimal.*amd64.*" rhel-9-2: ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4: ".*redhat.*9-4.*minimal.*amd64.*" + sles-15-5: ".*sles.*15-5.*amd64-[0-9]" + sles-15-6: ".*sles.*15-6.*amd64-[0-9]" + # rhel-7-6-sap-ha: ".*redhat.*7-6.*amd64.*hana.*" # retrievable from deprecated list + # rhel-7-9-sap-ha: ".*redhat.*7-9.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-1-sap-ha: ".*redhat.*8-1.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-2-sap-ha: ".*redhat.*8-2.*amd64.*hana.*" # retrievable from deprecated list rhel-8-4-sap-ha: ".*redhat.*8-4.*amd64.*hana.*" rhel-8-6-sap-ha: ".*redhat.*8-6.*amd64.*hana.*" rhel-8-8-sap-ha: ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha: ".*redhat.*8-10.*amd64.*hana.*" rhel-9-0-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" - rhel-9-2-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha: ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha: ".*redhat.*9-4.*amd64.*hana.*" + # sles-12-4-sap-ha: ".*sles.*12-4.*amd64.*hana.*" # retrievable from deprecated list + # sles-12-5-sap-ha: ".*sles.*12-5.*amd64.*hana.*" # retrievable from deprecated list + # sles-15-1-sap-ha: ".*sles.*15-1.*amd64.*hana.*" # retrievable from deprecated list sles-15-3-sap-ha: ".*sles.*15-3.*amd64.*hana.*" sles-15-4-sap-ha: ".*sles.*15-4.*amd64.*hana.*" sles-15-5-sap-ha: ".*sles.*15-5.*amd64.*hana.*" + sles-15-6-sap-ha: ".*sles.*15-6.*amd64.*hana.*" sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: @@ -623,17 +687,26 @@ sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: # Full Linux subscription ppc64le OS Images with support and activation keys sap_vm_provision_ibmcloud_powervs_host_os_image_dictionary: - rhel-8-4: ".*RHEL.*8.*4" - rhel-8-6: ".*RHEL.*8.*6" + rhel-8-8: ".*RHEL.*8.*8" rhel-9-2: ".*RHEL.*9.*2" - sles-15-3: ".*SLES.*15.*3" - sles-15-4: ".*SLES.*15.*4" + rhel-9-4: ".*RHEL.*9.*4" + sles-15-5: ".*SLES.*15.*5$" + rhel-8-4-sap-ha: "RHEL8-SP4-SAP" rhel-8-6-sap-ha: ".*RHEL.*8.*6.*SAP$" # ensure string suffix using $ rhel-8-8-sap-ha: ".*RHEL.*8.*8.*SAP$" # ensure string suffix using $ rhel-9-2-sap-ha: ".*RHEL.*9.*2.*SAP$" # ensure string suffix using $ sles-15-2-sap-ha: ".*SLES.*15.*2.*SAP$" # ensure string suffix using $ sles-15-3-sap-ha: ".*SLES.*15.*3.*SAP$" # ensure string suffix using $ sles-15-4-sap-ha: ".*SLES.*15.*4.*SAP$" # ensure string suffix using $ + sles-15-5-sap-ha: "SLES15-SP5-SAP" + # rhel-8-4-sap-ha-byol: "RHEL8-SP4-SAP-BYOL" + # rhel-8-6-sap-ha-byol: ".*RHEL.*8.*6.*SAP-BYOL$" # ensure string suffix using $ + # rhel-8-8-sap-ha-byol: ".*RHEL.*8.*8.*SAP-BYOL$" # ensure string suffix using $ + # rhel-9-2-sap-ha-byol: ".*RHEL.*9.*2.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-2-sap-ha-byol: ".*SLES.*15.*2.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-3-sap-ha-byol: ".*SLES.*15.*3.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-4-sap-ha-byol: ".*SLES.*15.*4.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-5-sap-ha-byol: "SLES15-SP5-SAP-BYOL" sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: @@ -753,96 +826,186 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: #### sap_vm_provision_msazure_vm_host_os_image_dictionary: - + rhel-8-0: + publisher: "RedHat" + offer: "RHEL" + sku: "8-gen2" + rhel-8-1: + publisher: "RedHat" + offer: "RHEL" + sku: "81-gen2" + rhel-8-2: + publisher: "RedHat" + offer: "RHEL" + sku: "82-gen2" + rhel-8-3: + publisher: "RedHat" + offer: "RHEL" + sku: "83-gen2" rhel-8-4: publisher: "RedHat" offer: "RHEL" sku: "84-gen2" - + rhel-8-5: + publisher: "RedHat" + offer: "RHEL" + sku: "85-gen2" + rhel-8-6: + publisher: "RedHat" + offer: "RHEL" + sku: "86-gen2" + rhel-8-7: + publisher: "RedHat" + offer: "RHEL" + sku: "87-gen2" + rhel-8-8: + publisher: "RedHat" + offer: "RHEL" + sku: "88-gen2" + rhel-8-9: + publisher: "RedHat" + offer: "RHEL" + sku: "89-gen2" + rhel-8-10: + publisher: "RedHat" + offer: "RHEL" + sku: "810-gen2" + rhel-9-0: + publisher: "RedHat" + offer: "RHEL" + sku: "90-gen2" + rhel-9-1: + publisher: "RedHat" + offer: "RHEL" + sku: "91-gen2" + rhel-9-2: + publisher: "RedHat" + offer: "RHEL" + sku: "92-gen2" + rhel-9-3: + publisher: "RedHat" + offer: "RHEL" + sku: "93-gen2" + rhel-9-4: + publisher: "RedHat" + offer: "RHEL" + sku: "94-gen2" + sles-12-5: + publisher: "SUSE" + offer: "sles-12-sp5" + sku: "gen2" + sles-15-1: + publisher: "SUSE" + offer: "sles-15-sp1" + sku: "gen2" + sles-15-2: + publisher: "SUSE" + offer: "sles-15-sp2" + sku: "gen2" + sles-15-3: + publisher: "SUSE" + offer: "sles-15-sp3" + sku: "gen2" + sles-15-4: + publisher: "SUSE" + offer: "sles-15-sp4" + sku: "gen2" + sles-15-5: + publisher: "SUSE" + offer: "sles-15-sp5" + sku: "gen2" + sles-15-6: + publisher: "SUSE" + offer: "sles-15-sp6" + sku: "gen2" rhel-8-1-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "81sapha-gen2" - rhel-8-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "82sapha-gen2" - rhel-8-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "84sapha-gen2" - rhel-8-6-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "86sapha-gen2" - rhel-8-8-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "88sapha-gen2" - + rhel-8-10-sap-ha: + publisher: "RedHat" + offer: "RHEL-SAP-HA" + sku: "810sapha-gen2" rhel-9-0-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "90sapha-gen2" - rhel-9-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "92sapha-gen2" - - rhel-8-1-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "81sapapps-gen2" - - rhel-8-2-sap-applications: + rhel-9-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" - sku: "82sapapps-gen2" - - rhel-8-4-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "84sapapps-gen2" - - rhel-8-6-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "86sapapps-gen2" - - rhel-8-8-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "88sapapps-gen2" - - rhel-9-0-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "90sapapps-gen2" - - rhel-9-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "92sapapps-gen2" - - sles-15-sp3-sap: + sku: "94sapha-gen2" + sles-12-5-sap-ha: + publisher: "SUSE" + offer: "sles-sap-12-sp5" + sku: "gen2" + sles-15-1-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp1" + sku: "gen2" + sles-15-2-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp2" + sku: "gen2" + sles-15-3-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp3" sku: "gen2" - - sles-15-sp4-sap: + sles-15-4-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp4" sku: "gen2" - - sles-15-sp5-sap: + sles-15-5-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp5" sku: "gen2" + sles-15-6-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp6" + sku: "gen2" + sles-15-1-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp1-byos" + sku: "gen2" + sles-15-2-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp2-byos" + sku: "gen2" + sles-15-3-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp3-byos" + sku: "gen2" + sles-15-4-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp4-byos" + sku: "gen2" + sles-15-5-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp5-byos" + sku: "gen2" + sles-15-6-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp6-byos" + sku: "gen2" sap_vm_provision_msazure_vm_host_specifications_dictionary: diff --git a/deploy_scenarios/sap_hana_ha/ansible_requirements.yml b/deploy_scenarios/sap_hana_ha/ansible_requirements.yml index af7ed22..1454ec5 100644 --- a/deploy_scenarios/sap_hana_ha/ansible_requirements.yml +++ b/deploy_scenarios/sap_hana_ha/ansible_requirements.yml @@ -8,16 +8,16 @@ collections: version: 6.1.0 - name: fedora.linux_system_roles type: galaxy - version: 1.82.0 + version: 1.88.9 - name: community.sap_install type: galaxy - version: 1.4.0 + version: 1.5.0 - name: community.sap_launchpad type: galaxy - version: 1.1.0 + version: 1.1.1 - name: community.sap_infrastructure type: galaxy - version: 1.0.1 + version: 1.1.0 # - name: community.sap_operations # type: galaxy # version: 0.9.1 @@ -25,23 +25,23 @@ collections: # Collections for Infrastructure from Ansible Galaxy - name: cloud.terraform type: galaxy - version: 1.1.0 + version: 3.0.0 - name: amazon.aws type: galaxy - version: 7.2.0 + version: 9.0.0 - name: community.aws type: galaxy - version: 7.1.0 + version: 9.0.0 - name: azure.azcollection type: galaxy - version: 2.2.0 + version: 3.0.1 - name: google.cloud type: galaxy version: 1.1.3 # Replace with ibm.cloud in future, legacy Ansible Collection uses hidden on-the-fly Terraform files in /var/tmp/ansible/ibmcloud) - name: ibm.cloudcollection type: galaxy - version: 1.51.0 + version: 1.71.2 - name: ovirt.ovirt type: galaxy version: 3.1.2 @@ -53,21 +53,12 @@ collections: version: 3.0.0 - name: cloud.common type: galaxy - version: 3.0.0 + version: 4.0.0 # Collections from public repositories via HTTPS # - name: https://github.com/sap-linuxlab/community.sap_install.git # type: git # version: dev -# - name: https://github.com/sap-linuxlab/community.sap_launchpad.git -# type: git -# version: main -# - name: https://github.com/sap-linuxlab/community.sap_operations.git -# type: git -# version: main -# - name: https://github.com/ansible-collections/cloud.terraform.git -# type: git -# version: main # Collections from private repositories via use SSH (embedded GitHub PAT does not work) # Used for customised/forked Ansible Collections diff --git a/deploy_scenarios/sap_hana_ha/optional/ansible_extravars_noninteractive.yml b/deploy_scenarios/sap_hana_ha/optional/ansible_extravars_noninteractive.yml index fdd2b92..2be85e0 100755 --- a/deploy_scenarios/sap_hana_ha/optional/ansible_extravars_noninteractive.yml +++ b/deploy_scenarios/sap_hana_ha/optional/ansible_extravars_noninteractive.yml @@ -110,13 +110,14 @@ sap_vm_provision_ibmcloud_vpc_sg_names: "ENTER_STRING_VALUE_HERE,ENTER_STRING_VA #### sap_vm_provision_ibmcloud_api_key: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ibmcloud_resource_group_name: "ENTER_STRING_VALUE_HERE" # if ansible_to_terraform, use "new" -sap_vm_provision_ibmcloud_private_dns_instance_name: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_private_dns_instance_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform sap_vm_provision_ibmcloud_powervs_location: "ENTER_STRING_VALUE_HERE" -sap_vm_provision_ibmcloud_powervs_workspace_name: "ENTER_STRING_VALUE_HERE" -sap_vm_provision_ibmcloud_powervs_vlan_subnet_name: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_powervs_workspace_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform +sap_vm_provision_ibmcloud_powervs_vlan_subnet_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform sap_vm_provision_ibmcloud_powervs_host_os_image: "ENTER_STRING_VALUE_HERE" sap_vm_provision_bastion_user: "ENTER_STRING_VALUE_HERE" sap_vm_provision_bastion_ssh_port: "ENTER_STRING_VALUE_HERE" +# sap_vm_provision_ibmcloud_vpc_subnet_name: "ENTER_STRING_VALUE_HERE" # only for ansible_to_terraform, can be name or 'new' # Only for use when 'ansible' is value provided for variable sap_vm_provision_iac_type #### @@ -124,6 +125,7 @@ sap_vm_provision_bastion_public_ip: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ssh_bastion_private_key_file_path: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ssh_host_private_key_file_path: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ibmcloud_powervs_key_pair_name_ssh_host_public_key: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_private_dns_custom_resolver_ip: "ENTER_STRING_VALUE_HERE" # sap_vm_provision_ibmcloud_private_dns_resource_group_name: "" # optional, default use of sap_vm_provision_ibmcloud_resource_group_name sap_vm_provision_proxy_web_forward_proxy_ip: "ENTER_STRING_VALUE_HERE" # IP:Port only, no http:// prefix sap_vm_provision_proxy_web_forward_exclusions: "localhost,127.0.0.1,{{ sap_vm_provision_dns_root_domain }}" @@ -325,7 +327,7 @@ sap_id_user: "ENTER_STRING_VALUE_HERE" sap_id_user_password: 'ENTER_STRING_VALUE_HERE' # Directory for SAP installation media -sap_software_download_directory: "ENTER_STRING_VALUE_HERE" +sap_install_media_detect_source_directory: "ENTER_STRING_VALUE_HERE" # e.g. /software #### @@ -359,17 +361,18 @@ sap_ha_install_hana_hsr_db_system_password: "{{ sap_hana_install_master_password #### -# Mandatory parameters : Virtual IPs (VIPs) -# AWS: the VIP must be **outside** of any VPC Subnet ranges -# GCP: the VIP must be within the VPC Subnetwork range attached to GCP Backend Service for the Internal passthrough Network Load Balancer -# IBM Cloud: the VIP is within the VPC Subnet range and is statically defined by the IBM Cloud Load Balancer (NLB L4 or ALB L7) -# IBM Cloud, Power VS: the VIP must be within the IBM Power Infrastructure VLAN Subnet range -# MS Azure: the VIP must be within the VNet Subnet range attached to the Azure Load Balancer (NLB L4) +# Infrastructure Platform - High Availability Virtual IPs (VIPs) +# +# AWS: the VIP must be **outside** of any VPC Subnet ranges (e.g. 192.168.100.102/32) +# GCP: the VIP must be within the VPC Subnetwork range attached to GCP Backend Service for the Internal passthrough Network Load Balancer (e.g. 10.10.10.10/32) +# IBM Cloud: the VIP is within the VPC Subnet range and is statically defined by the IBM Cloud Load Balancer [NLB L4 or ALB L7], variable should be commented out +# IBM Cloud, Power VS: the VIP must be within the IBM Power Infrastructure VLAN Subnet range (e.g. 192.168.4.4/26) +# MS Azure: the VIP must be within the VNet Subnet range attached to the Azure Load Balancer [NLB L4] (e.g. 10.10.10.10/22) # IBM PowerVM: the VIP must be within the VLAN Subnet range # OVirt KVM: the VIP must be within the VLAN Subnet range # KubeVirt: the VIP must be within the VLAN Subnet range #### -sap_ha_pacemaker_cluster_vip_hana_primary_ip_address: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ha_vip_hana_primary: "ENTER_STRING_VALUE_HERE" #### diff --git a/deploy_scenarios/sap_hana_scaleout/ansible_extravars.yml b/deploy_scenarios/sap_hana_scaleout/ansible_extravars.yml index 02735b6..1162d53 100755 --- a/deploy_scenarios/sap_hana_scaleout/ansible_extravars.yml +++ b/deploy_scenarios/sap_hana_scaleout/ansible_extravars.yml @@ -57,8 +57,8 @@ sap_hana_install_media_dictionary: softwarecenter_search_list_saphana_ppc64le: - 'SAPCAR_1115-70006238.EXE' - - 'IMDB_SERVER20_077_0-80002031.SAR' - - 'SAPHOSTAGENT62_62-80004822.SAR' # SAP Host Agent 7.22 + - 'IMDB_SERVER20_077_0-80002046.SAR' + - 'SAPHOSTAGENT62_62-80004831.SAR' # SAP Host Agent 7.22 sap_hana_2_sps06_install: @@ -143,27 +143,43 @@ sap_vm_provision_calculate_sap_hana_scaleout_standby: 1 # Only 0 or 1 sap_vm_provision_aws_ec2_vs_host_os_image_dictionary: rhel-8-1: "*RHEL-8.1*_HVM*x86_64*" - rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" + # rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" # removed rhel-8-4: "*RHEL-8.4*_HVM*x86_64*" rhel-8-6: "*RHEL-8.6*_HVM*x86_64*" rhel-8-8: "*RHEL-8.8*_HVM*x86_64*" + rhel-8-10: "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0: "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1: "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2: "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3: "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4: "*RHEL-9.4*_HVM*x86_64*" + sles-12-5: "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" # removed + # sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" # removed + # sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" # removed + sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6: "*suse-sles-15-sp6-v202*-hvm-ssd-x86_64*" + # rhel-7-7-sap-ha: "*RHEL-SAP-8.1.0*" # removed + # rhel-7-9-sap-ha: "*RHEL-SAP-8.1.0*" # removed rhel-8-1-sap-ha: "*RHEL-SAP-8.1.0*" rhel-8-2-sap-ha: "*RHEL-SAP-8.2.0*" rhel-8-4-sap-ha: "*RHEL-SAP-8.4.0*" rhel-8-6-sap-ha: "*RHEL-SAP-8.6.0*" rhel-8-8-sap-ha: "*RHEL-SAP-8.8.0*" + rhel-8-10-sap-ha: "*RHEL-SAP-8.10.0*" rhel-9-0-sap-ha: "*RHEL-SAP-9.0.0*" rhel-9-2-sap-ha: "*RHEL-SAP-9.2.0*" - sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" - sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" - sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" - sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + rhel-9-4-sap-ha: "*RHEL-SAP-9.4.0*" sles-12-5-sap-ha: "*suse-sles-sap-12-sp5-v202*-hvm-ssd-x86_64*" sles-15-1-sap-ha: "*suse-sles-sap-15-sp1-v202*-hvm-ssd-x86_64*" sles-15-2-sap-ha: "*suse-sles-sap-15-sp2-v202*-hvm-ssd-x86_64*" sles-15-3-sap-ha: "*suse-sles-sap-15-sp3-v202*-hvm-ssd-x86_64*" sles-15-4-sap-ha: "*suse-sles-sap-15-sp4-v202*-hvm-ssd-x86_64*" sles-15-5-sap-ha: "*suse-sles-sap-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha: "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" + sles-15-4-sap-ha-byos: "*suse-sles-sap-15-sp4-byos-v202*-hvm-ssd-x86_64*" + sles-15-5-sap-ha-byos: "*suse-sles-sap-15-sp5-byos-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha-byos: "*suse-sles-sap-15-sp6-byos-v202*-hvm-ssd-x86_64*" sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: @@ -221,42 +237,75 @@ sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: #### sap_vm_provision_gcp_ce_vm_host_os_image_dictionary: - rhel-8-latest: project: "rhel-cloud" family: "rhel-8" - - rhel-8-1-sap-ha: + rhel-9-latest: + project: "rhel-cloud" + family: "rhel-9" + sles-12-latest: + project: "suse-cloud" + family: "sles-12" + sles-15-latest: + project: "suse-cloud" + family: "sles-15" + # rhel-7-7-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-7-7-sap-ha" + rhel-7-9-sap-ha: project: "rhel-sap-cloud" - family: "rhel-8-1-sap-ha" - + family: "rhel-7-9-sap-ha" + # rhel-8-1-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-8-1-sap-ha" rhel-8-2-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-2-sap-ha" - rhel-8-4-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-4-sap-ha" - rhel-8-6-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-6-sap-ha" - - sles-15-latest: - project: "suse-cloud" - family: "sles-15" - - sles-15-sp3-sap: + sles-12-5-sap-ha: + project: "suse-sap-cloud" + family: "sles-12-sp5-sap" + # sles-15-1-sap-ha: # removed + # project: "suse-sap-cloud" + # family: "sles-15-sp1-sap" + sles-15-2-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp2-sap" + sles-15-3-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp3-sap" - - sles-15-sp4-sap: + sles-15-4-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp4-sap" - - sles-15-sp5-sap: + sles-15-5-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp5-sap" + sles-15-6-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp6-sap" + sles-12-5-sap-ha-byos: + project: "suse-byos-cloud" + family: "sles-12-sp5-sap-byos" + sles-15-2-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp2-sap-byos" + sles-15-3-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp3-sap-byos" + sles-15-4-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp4-sap-byos" + sles-15-5-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp5-sap-byos" + sles-15-6-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp6-sap-byos" sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: @@ -318,16 +367,31 @@ sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: sap_vm_provision_ibmcloud_vs_host_os_image_dictionary: rhel-8-4: ".*redhat.*8-4.*minimal.*amd64.*" rhel-8-6: ".*redhat.*8-6.*minimal.*amd64.*" + rhel-8-8: ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10: ".*redhat.*8-10.*minimal.*amd64.*" rhel-9-0: ".*redhat.*9-0.*minimal.*amd64.*" rhel-9-2: ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4: ".*redhat.*9-4.*minimal.*amd64.*" + sles-15-5: ".*sles.*15-5.*amd64-[0-9]" + sles-15-6: ".*sles.*15-6.*amd64-[0-9]" + # rhel-7-6-sap-ha: ".*redhat.*7-6.*amd64.*hana.*" # retrievable from deprecated list + # rhel-7-9-sap-ha: ".*redhat.*7-9.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-1-sap-ha: ".*redhat.*8-1.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-2-sap-ha: ".*redhat.*8-2.*amd64.*hana.*" # retrievable from deprecated list rhel-8-4-sap-ha: ".*redhat.*8-4.*amd64.*hana.*" rhel-8-6-sap-ha: ".*redhat.*8-6.*amd64.*hana.*" rhel-8-8-sap-ha: ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha: ".*redhat.*8-10.*amd64.*hana.*" rhel-9-0-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" - rhel-9-2-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha: ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha: ".*redhat.*9-4.*amd64.*hana.*" + # sles-12-4-sap-ha: ".*sles.*12-4.*amd64.*hana.*" # retrievable from deprecated list + # sles-12-5-sap-ha: ".*sles.*12-5.*amd64.*hana.*" # retrievable from deprecated list + # sles-15-1-sap-ha: ".*sles.*15-1.*amd64.*hana.*" # retrievable from deprecated list sles-15-3-sap-ha: ".*sles.*15-3.*amd64.*hana.*" sles-15-4-sap-ha: ".*sles.*15-4.*amd64.*hana.*" sles-15-5-sap-ha: ".*sles.*15-5.*amd64.*hana.*" + sles-15-6-sap-ha: ".*sles.*15-6.*amd64.*hana.*" sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: @@ -401,17 +465,26 @@ sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: # Full Linux subscription ppc64le OS Images with support and activation keys sap_vm_provision_ibmcloud_powervs_host_os_image_dictionary: - rhel-8-4: ".*RHEL.*8.*4" - rhel-8-6: ".*RHEL.*8.*6" + rhel-8-8: ".*RHEL.*8.*8" rhel-9-2: ".*RHEL.*9.*2" - sles-15-3: ".*SLES.*15.*3" - sles-15-4: ".*SLES.*15.*4" + rhel-9-4: ".*RHEL.*9.*4" + sles-15-5: ".*SLES.*15.*5$" + rhel-8-4-sap-ha: "RHEL8-SP4-SAP" rhel-8-6-sap-ha: ".*RHEL.*8.*6.*SAP$" # ensure string suffix using $ rhel-8-8-sap-ha: ".*RHEL.*8.*8.*SAP$" # ensure string suffix using $ rhel-9-2-sap-ha: ".*RHEL.*9.*2.*SAP$" # ensure string suffix using $ sles-15-2-sap-ha: ".*SLES.*15.*2.*SAP$" # ensure string suffix using $ sles-15-3-sap-ha: ".*SLES.*15.*3.*SAP$" # ensure string suffix using $ sles-15-4-sap-ha: ".*SLES.*15.*4.*SAP$" # ensure string suffix using $ + sles-15-5-sap-ha: "SLES15-SP5-SAP" + # rhel-8-4-sap-ha-byol: "RHEL8-SP4-SAP-BYOL" + # rhel-8-6-sap-ha-byol: ".*RHEL.*8.*6.*SAP-BYOL$" # ensure string suffix using $ + # rhel-8-8-sap-ha-byol: ".*RHEL.*8.*8.*SAP-BYOL$" # ensure string suffix using $ + # rhel-9-2-sap-ha-byol: ".*RHEL.*9.*2.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-2-sap-ha-byol: ".*SLES.*15.*2.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-3-sap-ha-byol: ".*SLES.*15.*3.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-4-sap-ha-byol: ".*SLES.*15.*4.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-5-sap-ha-byol: "SLES15-SP5-SAP-BYOL" sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: @@ -469,7 +542,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: - name: swap # hdb swap_path: /swapfile # use swap file on root disk, instead of creating LVM LV for swap disk_size: 2 - disk_type: tier3 + disk_type: tier1 filesystem_type: swap # must be swap filesystem - name: software @@ -485,96 +558,186 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: #### sap_vm_provision_msazure_vm_host_os_image_dictionary: - + rhel-8-0: + publisher: "RedHat" + offer: "RHEL" + sku: "8-gen2" + rhel-8-1: + publisher: "RedHat" + offer: "RHEL" + sku: "81-gen2" + rhel-8-2: + publisher: "RedHat" + offer: "RHEL" + sku: "82-gen2" + rhel-8-3: + publisher: "RedHat" + offer: "RHEL" + sku: "83-gen2" rhel-8-4: publisher: "RedHat" offer: "RHEL" sku: "84-gen2" - + rhel-8-5: + publisher: "RedHat" + offer: "RHEL" + sku: "85-gen2" + rhel-8-6: + publisher: "RedHat" + offer: "RHEL" + sku: "86-gen2" + rhel-8-7: + publisher: "RedHat" + offer: "RHEL" + sku: "87-gen2" + rhel-8-8: + publisher: "RedHat" + offer: "RHEL" + sku: "88-gen2" + rhel-8-9: + publisher: "RedHat" + offer: "RHEL" + sku: "89-gen2" + rhel-8-10: + publisher: "RedHat" + offer: "RHEL" + sku: "810-gen2" + rhel-9-0: + publisher: "RedHat" + offer: "RHEL" + sku: "90-gen2" + rhel-9-1: + publisher: "RedHat" + offer: "RHEL" + sku: "91-gen2" + rhel-9-2: + publisher: "RedHat" + offer: "RHEL" + sku: "92-gen2" + rhel-9-3: + publisher: "RedHat" + offer: "RHEL" + sku: "93-gen2" + rhel-9-4: + publisher: "RedHat" + offer: "RHEL" + sku: "94-gen2" + sles-12-5: + publisher: "SUSE" + offer: "sles-12-sp5" + sku: "gen2" + sles-15-1: + publisher: "SUSE" + offer: "sles-15-sp1" + sku: "gen2" + sles-15-2: + publisher: "SUSE" + offer: "sles-15-sp2" + sku: "gen2" + sles-15-3: + publisher: "SUSE" + offer: "sles-15-sp3" + sku: "gen2" + sles-15-4: + publisher: "SUSE" + offer: "sles-15-sp4" + sku: "gen2" + sles-15-5: + publisher: "SUSE" + offer: "sles-15-sp5" + sku: "gen2" + sles-15-6: + publisher: "SUSE" + offer: "sles-15-sp6" + sku: "gen2" rhel-8-1-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "81sapha-gen2" - rhel-8-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "82sapha-gen2" - rhel-8-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "84sapha-gen2" - rhel-8-6-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "86sapha-gen2" - rhel-8-8-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "88sapha-gen2" - + rhel-8-10-sap-ha: + publisher: "RedHat" + offer: "RHEL-SAP-HA" + sku: "810sapha-gen2" rhel-9-0-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "90sapha-gen2" - rhel-9-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "92sapha-gen2" - - rhel-8-1-sap-applications: + rhel-9-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" - sku: "81sapapps-gen2" - - rhel-8-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "82sapapps-gen2" - - rhel-8-4-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "84sapapps-gen2" - - rhel-8-6-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "86sapapps-gen2" - - rhel-8-8-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "88sapapps-gen2" - - rhel-9-0-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "90sapapps-gen2" - - rhel-9-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "92sapapps-gen2" - - sles-15-sp3-sap: + sku: "94sapha-gen2" + sles-12-5-sap-ha: + publisher: "SUSE" + offer: "sles-sap-12-sp5" + sku: "gen2" + sles-15-1-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp1" + sku: "gen2" + sles-15-2-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp2" + sku: "gen2" + sles-15-3-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp3" sku: "gen2" - - sles-15-sp4-sap: + sles-15-4-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp4" sku: "gen2" - - sles-15-sp5-sap: + sles-15-5-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp5" sku: "gen2" + sles-15-6-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp6" + sku: "gen2" + sles-15-1-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp1-byos" + sku: "gen2" + sles-15-2-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp2-byos" + sku: "gen2" + sles-15-3-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp3-byos" + sku: "gen2" + sles-15-4-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp4-byos" + sku: "gen2" + sles-15-5-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp5-byos" + sku: "gen2" + sles-15-6-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp6-byos" + sku: "gen2" sap_vm_provision_msazure_vm_host_specifications_dictionary: diff --git a/deploy_scenarios/sap_hana_scaleout/ansible_playbook.yml b/deploy_scenarios/sap_hana_scaleout/ansible_playbook.yml index 411062b..5aef6cd 100644 --- a/deploy_scenarios/sap_hana_scaleout/ansible_playbook.yml +++ b/deploy_scenarios/sap_hana_scaleout/ansible_playbook.yml @@ -340,12 +340,12 @@ ansible.builtin.set_fact: sap_hana_install_addhosts: | {%- if sap_vm_provision_calculate_sap_hana_scaleout_standby > 0 -%} - {%- for host in (groups['hana_primary'] | reject('search', '0') | list)[:-1] -%} + {%- for host in (groups['hana_primary'] | reject('regex', '0$') | list)[:-1] -%} {{ hostvars[host]['inventory_hostname_short'] }}:role=worker:workergroup={{ sap_hana_install_workergroup }}:group={{ sap_hana_install_group }}, {%- endfor -%} {{ hostvars[(groups['hana_primary'][-1])]['inventory_hostname_short'] }}:role=standby:workergroup={{ sap_hana_install_workergroup }}:group={{ sap_hana_install_group }} {%- elif sap_vm_provision_calculate_sap_hana_scaleout_standby == 0 -%} - {%- for host in (groups['hana_primary'] | reject('search', '0') | list) -%} + {%- for host in (groups['hana_primary'] | reject('regex', '0$') | list) -%} {{ hostvars[host]['inventory_hostname_short'] }}:role=worker:workergroup={{ sap_hana_install_workergroup }}:group={{ sap_hana_install_group }} {%- endfor -%} {%- endif -%} diff --git a/deploy_scenarios/sap_hana_scaleout/ansible_requirements.yml b/deploy_scenarios/sap_hana_scaleout/ansible_requirements.yml index af7ed22..1454ec5 100644 --- a/deploy_scenarios/sap_hana_scaleout/ansible_requirements.yml +++ b/deploy_scenarios/sap_hana_scaleout/ansible_requirements.yml @@ -8,16 +8,16 @@ collections: version: 6.1.0 - name: fedora.linux_system_roles type: galaxy - version: 1.82.0 + version: 1.88.9 - name: community.sap_install type: galaxy - version: 1.4.0 + version: 1.5.0 - name: community.sap_launchpad type: galaxy - version: 1.1.0 + version: 1.1.1 - name: community.sap_infrastructure type: galaxy - version: 1.0.1 + version: 1.1.0 # - name: community.sap_operations # type: galaxy # version: 0.9.1 @@ -25,23 +25,23 @@ collections: # Collections for Infrastructure from Ansible Galaxy - name: cloud.terraform type: galaxy - version: 1.1.0 + version: 3.0.0 - name: amazon.aws type: galaxy - version: 7.2.0 + version: 9.0.0 - name: community.aws type: galaxy - version: 7.1.0 + version: 9.0.0 - name: azure.azcollection type: galaxy - version: 2.2.0 + version: 3.0.1 - name: google.cloud type: galaxy version: 1.1.3 # Replace with ibm.cloud in future, legacy Ansible Collection uses hidden on-the-fly Terraform files in /var/tmp/ansible/ibmcloud) - name: ibm.cloudcollection type: galaxy - version: 1.51.0 + version: 1.71.2 - name: ovirt.ovirt type: galaxy version: 3.1.2 @@ -53,21 +53,12 @@ collections: version: 3.0.0 - name: cloud.common type: galaxy - version: 3.0.0 + version: 4.0.0 # Collections from public repositories via HTTPS # - name: https://github.com/sap-linuxlab/community.sap_install.git # type: git # version: dev -# - name: https://github.com/sap-linuxlab/community.sap_launchpad.git -# type: git -# version: main -# - name: https://github.com/sap-linuxlab/community.sap_operations.git -# type: git -# version: main -# - name: https://github.com/ansible-collections/cloud.terraform.git -# type: git -# version: main # Collections from private repositories via use SSH (embedded GitHub PAT does not work) # Used for customised/forked Ansible Collections diff --git a/deploy_scenarios/sap_hana_scaleout/optional/ansible_extravars_noninteractive.yml b/deploy_scenarios/sap_hana_scaleout/optional/ansible_extravars_noninteractive.yml index c391749..c0ced63 100755 --- a/deploy_scenarios/sap_hana_scaleout/optional/ansible_extravars_noninteractive.yml +++ b/deploy_scenarios/sap_hana_scaleout/optional/ansible_extravars_noninteractive.yml @@ -120,13 +120,14 @@ sap_vm_provision_ibmcloud_vpc_sg_names: "ENTER_STRING_VALUE_HERE,ENTER_STRING_VA #### sap_vm_provision_ibmcloud_api_key: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ibmcloud_resource_group_name: "ENTER_STRING_VALUE_HERE" # if ansible_to_terraform, use "new" -sap_vm_provision_ibmcloud_private_dns_instance_name: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_private_dns_instance_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform sap_vm_provision_ibmcloud_powervs_location: "ENTER_STRING_VALUE_HERE" -sap_vm_provision_ibmcloud_powervs_workspace_name: "ENTER_STRING_VALUE_HERE" -sap_vm_provision_ibmcloud_powervs_vlan_subnet_name: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_powervs_workspace_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform +sap_vm_provision_ibmcloud_powervs_vlan_subnet_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform sap_vm_provision_ibmcloud_powervs_host_os_image: "ENTER_STRING_VALUE_HERE" sap_vm_provision_bastion_user: "ENTER_STRING_VALUE_HERE" sap_vm_provision_bastion_ssh_port: "ENTER_STRING_VALUE_HERE" +# sap_vm_provision_ibmcloud_vpc_subnet_name: "ENTER_STRING_VALUE_HERE" # only for ansible_to_terraform, can be name or 'new' # Only for use when 'ansible' is value provided for variable sap_vm_provision_iac_type #### @@ -134,6 +135,7 @@ sap_vm_provision_bastion_public_ip: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ssh_bastion_private_key_file_path: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ssh_host_private_key_file_path: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ibmcloud_powervs_key_pair_name_ssh_host_public_key: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_private_dns_custom_resolver_ip: "ENTER_STRING_VALUE_HERE" # sap_vm_provision_ibmcloud_private_dns_resource_group_name: "" # optional, default use of sap_vm_provision_ibmcloud_resource_group_name sap_vm_provision_proxy_web_forward_proxy_ip: "ENTER_STRING_VALUE_HERE" # IP:Port only, no http:// prefix sap_vm_provision_proxy_web_forward_exclusions: "localhost,127.0.0.1,{{ sap_vm_provision_dns_root_domain }}" @@ -350,7 +352,7 @@ sap_id_user: "ENTER_STRING_VALUE_HERE" sap_id_user_password: 'ENTER_STRING_VALUE_HERE' # Directory for SAP installation media -sap_software_download_directory: "ENTER_STRING_VALUE_HERE" +sap_install_media_detect_source_directory: "ENTER_STRING_VALUE_HERE" # e.g. /software #### diff --git a/deploy_scenarios/sap_ides_ecc_hana_sandbox/ansible_extravars.yml b/deploy_scenarios/sap_ides_ecc_hana_sandbox/ansible_extravars.yml index fa75c99..7cd17c6 100755 --- a/deploy_scenarios/sap_ides_ecc_hana_sandbox/ansible_extravars.yml +++ b/deploy_scenarios/sap_ides_ecc_hana_sandbox/ansible_extravars.yml @@ -211,27 +211,43 @@ sap_swpm_templates_install_dictionary: sap_vm_provision_aws_ec2_vs_host_os_image_dictionary: rhel-8-1: "*RHEL-8.1*_HVM*x86_64*" - rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" + # rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" # removed rhel-8-4: "*RHEL-8.4*_HVM*x86_64*" rhel-8-6: "*RHEL-8.6*_HVM*x86_64*" rhel-8-8: "*RHEL-8.8*_HVM*x86_64*" + rhel-8-10: "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0: "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1: "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2: "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3: "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4: "*RHEL-9.4*_HVM*x86_64*" + sles-12-5: "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" # removed + # sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" # removed + # sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" # removed + sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6: "*suse-sles-15-sp6-v202*-hvm-ssd-x86_64*" + # rhel-7-7-sap-ha: "*RHEL-SAP-8.1.0*" # removed + # rhel-7-9-sap-ha: "*RHEL-SAP-8.1.0*" # removed rhel-8-1-sap-ha: "*RHEL-SAP-8.1.0*" rhel-8-2-sap-ha: "*RHEL-SAP-8.2.0*" rhel-8-4-sap-ha: "*RHEL-SAP-8.4.0*" rhel-8-6-sap-ha: "*RHEL-SAP-8.6.0*" rhel-8-8-sap-ha: "*RHEL-SAP-8.8.0*" + rhel-8-10-sap-ha: "*RHEL-SAP-8.10.0*" rhel-9-0-sap-ha: "*RHEL-SAP-9.0.0*" rhel-9-2-sap-ha: "*RHEL-SAP-9.2.0*" - sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" - sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" - sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" - sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + rhel-9-4-sap-ha: "*RHEL-SAP-9.4.0*" sles-12-5-sap-ha: "*suse-sles-sap-12-sp5-v202*-hvm-ssd-x86_64*" sles-15-1-sap-ha: "*suse-sles-sap-15-sp1-v202*-hvm-ssd-x86_64*" sles-15-2-sap-ha: "*suse-sles-sap-15-sp2-v202*-hvm-ssd-x86_64*" sles-15-3-sap-ha: "*suse-sles-sap-15-sp3-v202*-hvm-ssd-x86_64*" sles-15-4-sap-ha: "*suse-sles-sap-15-sp4-v202*-hvm-ssd-x86_64*" sles-15-5-sap-ha: "*suse-sles-sap-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha: "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" + sles-15-4-sap-ha-byos: "*suse-sles-sap-15-sp4-byos-v202*-hvm-ssd-x86_64*" + sles-15-5-sap-ha-byos: "*suse-sles-sap-15-sp5-byos-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha-byos: "*suse-sles-sap-15-sp6-byos-v202*-hvm-ssd-x86_64*" sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: @@ -311,42 +327,75 @@ sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: #### sap_vm_provision_gcp_ce_vm_host_os_image_dictionary: - rhel-8-latest: project: "rhel-cloud" family: "rhel-8" - - rhel-8-1-sap-ha: + rhel-9-latest: + project: "rhel-cloud" + family: "rhel-9" + sles-12-latest: + project: "suse-cloud" + family: "sles-12" + sles-15-latest: + project: "suse-cloud" + family: "sles-15" + # rhel-7-7-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-7-7-sap-ha" + rhel-7-9-sap-ha: project: "rhel-sap-cloud" - family: "rhel-8-1-sap-ha" - + family: "rhel-7-9-sap-ha" + # rhel-8-1-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-8-1-sap-ha" rhel-8-2-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-2-sap-ha" - rhel-8-4-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-4-sap-ha" - rhel-8-6-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-6-sap-ha" - - sles-15-latest: - project: "suse-cloud" - family: "sles-15" - - sles-15-sp3-sap: + sles-12-5-sap-ha: + project: "suse-sap-cloud" + family: "sles-12-sp5-sap" + # sles-15-1-sap-ha: # removed + # project: "suse-sap-cloud" + # family: "sles-15-sp1-sap" + sles-15-2-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp2-sap" + sles-15-3-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp3-sap" - - sles-15-sp4-sap: + sles-15-4-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp4-sap" - - sles-15-sp5-sap: + sles-15-5-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp5-sap" + sles-15-6-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp6-sap" + sles-12-5-sap-ha-byos: + project: "suse-byos-cloud" + family: "sles-12-sp5-sap-byos" + sles-15-2-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp2-sap-byos" + sles-15-3-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp3-sap-byos" + sles-15-4-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp4-sap-byos" + sles-15-5-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp5-sap-byos" + sles-15-6-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp6-sap-byos" sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: @@ -424,16 +473,31 @@ sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: sap_vm_provision_ibmcloud_vs_host_os_image_dictionary: rhel-8-4: ".*redhat.*8-4.*minimal.*amd64.*" rhel-8-6: ".*redhat.*8-6.*minimal.*amd64.*" + rhel-8-8: ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10: ".*redhat.*8-10.*minimal.*amd64.*" rhel-9-0: ".*redhat.*9-0.*minimal.*amd64.*" rhel-9-2: ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4: ".*redhat.*9-4.*minimal.*amd64.*" + sles-15-5: ".*sles.*15-5.*amd64-[0-9]" + sles-15-6: ".*sles.*15-6.*amd64-[0-9]" + # rhel-7-6-sap-ha: ".*redhat.*7-6.*amd64.*hana.*" # retrievable from deprecated list + # rhel-7-9-sap-ha: ".*redhat.*7-9.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-1-sap-ha: ".*redhat.*8-1.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-2-sap-ha: ".*redhat.*8-2.*amd64.*hana.*" # retrievable from deprecated list rhel-8-4-sap-ha: ".*redhat.*8-4.*amd64.*hana.*" rhel-8-6-sap-ha: ".*redhat.*8-6.*amd64.*hana.*" rhel-8-8-sap-ha: ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha: ".*redhat.*8-10.*amd64.*hana.*" rhel-9-0-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" - rhel-9-2-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha: ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha: ".*redhat.*9-4.*amd64.*hana.*" + # sles-12-4-sap-ha: ".*sles.*12-4.*amd64.*hana.*" # retrievable from deprecated list + # sles-12-5-sap-ha: ".*sles.*12-5.*amd64.*hana.*" # retrievable from deprecated list + # sles-15-1-sap-ha: ".*sles.*15-1.*amd64.*hana.*" # retrievable from deprecated list sles-15-3-sap-ha: ".*sles.*15-3.*amd64.*hana.*" sles-15-4-sap-ha: ".*sles.*15-4.*amd64.*hana.*" sles-15-5-sap-ha: ".*sles.*15-5.*amd64.*hana.*" + sles-15-6-sap-ha: ".*sles.*15-6.*amd64.*hana.*" sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: @@ -522,17 +586,26 @@ sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: # Full Linux subscription ppc64le OS Images with support and activation keys sap_vm_provision_ibmcloud_powervs_host_os_image_dictionary: - rhel-8-4: ".*RHEL.*8.*4" - rhel-8-6: ".*RHEL.*8.*6" + rhel-8-8: ".*RHEL.*8.*8" rhel-9-2: ".*RHEL.*9.*2" - sles-15-3: ".*SLES.*15.*3" - sles-15-4: ".*SLES.*15.*4" + rhel-9-4: ".*RHEL.*9.*4" + sles-15-5: ".*SLES.*15.*5$" + rhel-8-4-sap-ha: "RHEL8-SP4-SAP" rhel-8-6-sap-ha: ".*RHEL.*8.*6.*SAP$" # ensure string suffix using $ rhel-8-8-sap-ha: ".*RHEL.*8.*8.*SAP$" # ensure string suffix using $ rhel-9-2-sap-ha: ".*RHEL.*9.*2.*SAP$" # ensure string suffix using $ sles-15-2-sap-ha: ".*SLES.*15.*2.*SAP$" # ensure string suffix using $ sles-15-3-sap-ha: ".*SLES.*15.*3.*SAP$" # ensure string suffix using $ sles-15-4-sap-ha: ".*SLES.*15.*4.*SAP$" # ensure string suffix using $ + sles-15-5-sap-ha: "SLES15-SP5-SAP" + # rhel-8-4-sap-ha-byol: "RHEL8-SP4-SAP-BYOL" + # rhel-8-6-sap-ha-byol: ".*RHEL.*8.*6.*SAP-BYOL$" # ensure string suffix using $ + # rhel-8-8-sap-ha-byol: ".*RHEL.*8.*8.*SAP-BYOL$" # ensure string suffix using $ + # rhel-9-2-sap-ha-byol: ".*RHEL.*9.*2.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-2-sap-ha-byol: ".*SLES.*15.*2.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-3-sap-ha-byol: ".*SLES.*15.*3.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-4-sap-ha-byol: ".*SLES.*15.*4.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-5-sap-ha-byol: "SLES15-SP5-SAP-BYOL" sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: @@ -592,7 +665,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: # See SAP Note 1597355 - Swap-space recommendation for Linux - name: swap # sbx disk_size: 96 - disk_type: tier3 + disk_type: tier1 filesystem_type: swap # must be swap filesystem - name: software @@ -608,96 +681,186 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: #### sap_vm_provision_msazure_vm_host_os_image_dictionary: - + rhel-8-0: + publisher: "RedHat" + offer: "RHEL" + sku: "8-gen2" + rhel-8-1: + publisher: "RedHat" + offer: "RHEL" + sku: "81-gen2" + rhel-8-2: + publisher: "RedHat" + offer: "RHEL" + sku: "82-gen2" + rhel-8-3: + publisher: "RedHat" + offer: "RHEL" + sku: "83-gen2" rhel-8-4: publisher: "RedHat" offer: "RHEL" sku: "84-gen2" - + rhel-8-5: + publisher: "RedHat" + offer: "RHEL" + sku: "85-gen2" + rhel-8-6: + publisher: "RedHat" + offer: "RHEL" + sku: "86-gen2" + rhel-8-7: + publisher: "RedHat" + offer: "RHEL" + sku: "87-gen2" + rhel-8-8: + publisher: "RedHat" + offer: "RHEL" + sku: "88-gen2" + rhel-8-9: + publisher: "RedHat" + offer: "RHEL" + sku: "89-gen2" + rhel-8-10: + publisher: "RedHat" + offer: "RHEL" + sku: "810-gen2" + rhel-9-0: + publisher: "RedHat" + offer: "RHEL" + sku: "90-gen2" + rhel-9-1: + publisher: "RedHat" + offer: "RHEL" + sku: "91-gen2" + rhel-9-2: + publisher: "RedHat" + offer: "RHEL" + sku: "92-gen2" + rhel-9-3: + publisher: "RedHat" + offer: "RHEL" + sku: "93-gen2" + rhel-9-4: + publisher: "RedHat" + offer: "RHEL" + sku: "94-gen2" + sles-12-5: + publisher: "SUSE" + offer: "sles-12-sp5" + sku: "gen2" + sles-15-1: + publisher: "SUSE" + offer: "sles-15-sp1" + sku: "gen2" + sles-15-2: + publisher: "SUSE" + offer: "sles-15-sp2" + sku: "gen2" + sles-15-3: + publisher: "SUSE" + offer: "sles-15-sp3" + sku: "gen2" + sles-15-4: + publisher: "SUSE" + offer: "sles-15-sp4" + sku: "gen2" + sles-15-5: + publisher: "SUSE" + offer: "sles-15-sp5" + sku: "gen2" + sles-15-6: + publisher: "SUSE" + offer: "sles-15-sp6" + sku: "gen2" rhel-8-1-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "81sapha-gen2" - rhel-8-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "82sapha-gen2" - rhel-8-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "84sapha-gen2" - rhel-8-6-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "86sapha-gen2" - rhel-8-8-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "88sapha-gen2" - + rhel-8-10-sap-ha: + publisher: "RedHat" + offer: "RHEL-SAP-HA" + sku: "810sapha-gen2" rhel-9-0-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "90sapha-gen2" - rhel-9-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "92sapha-gen2" - - rhel-8-1-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "81sapapps-gen2" - - rhel-8-2-sap-applications: + rhel-9-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" - sku: "82sapapps-gen2" - - rhel-8-4-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "84sapapps-gen2" - - rhel-8-6-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "86sapapps-gen2" - - rhel-8-8-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "88sapapps-gen2" - - rhel-9-0-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "90sapapps-gen2" - - rhel-9-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "92sapapps-gen2" - - sles-15-sp3-sap: + sku: "94sapha-gen2" + sles-12-5-sap-ha: + publisher: "SUSE" + offer: "sles-sap-12-sp5" + sku: "gen2" + sles-15-1-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp1" + sku: "gen2" + sles-15-2-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp2" + sku: "gen2" + sles-15-3-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp3" sku: "gen2" - - sles-15-sp4-sap: + sles-15-4-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp4" sku: "gen2" - - sles-15-sp5-sap: + sles-15-5-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp5" sku: "gen2" + sles-15-6-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp6" + sku: "gen2" + sles-15-1-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp1-byos" + sku: "gen2" + sles-15-2-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp2-byos" + sku: "gen2" + sles-15-3-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp3-byos" + sku: "gen2" + sles-15-4-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp4-byos" + sku: "gen2" + sles-15-5-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp5-byos" + sku: "gen2" + sles-15-6-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp6-byos" + sku: "gen2" sap_vm_provision_msazure_vm_host_specifications_dictionary: diff --git a/deploy_scenarios/sap_ides_ecc_hana_sandbox/ansible_playbook.yml b/deploy_scenarios/sap_ides_ecc_hana_sandbox/ansible_playbook.yml index 5c73e8e..e20330b 100644 --- a/deploy_scenarios/sap_ides_ecc_hana_sandbox/ansible_playbook.yml +++ b/deploy_scenarios/sap_ides_ecc_hana_sandbox/ansible_playbook.yml @@ -129,7 +129,6 @@ mode: '0755' loop: - "{{ sap_install_media_detect_source_directory }}" - - "{{ sap_hana_install_software_directory }}" - name: Install Python package manager pip3 to system Python ansible.builtin.package: diff --git a/deploy_scenarios/sap_ides_ecc_hana_sandbox/ansible_requirements.yml b/deploy_scenarios/sap_ides_ecc_hana_sandbox/ansible_requirements.yml index af7ed22..1454ec5 100644 --- a/deploy_scenarios/sap_ides_ecc_hana_sandbox/ansible_requirements.yml +++ b/deploy_scenarios/sap_ides_ecc_hana_sandbox/ansible_requirements.yml @@ -8,16 +8,16 @@ collections: version: 6.1.0 - name: fedora.linux_system_roles type: galaxy - version: 1.82.0 + version: 1.88.9 - name: community.sap_install type: galaxy - version: 1.4.0 + version: 1.5.0 - name: community.sap_launchpad type: galaxy - version: 1.1.0 + version: 1.1.1 - name: community.sap_infrastructure type: galaxy - version: 1.0.1 + version: 1.1.0 # - name: community.sap_operations # type: galaxy # version: 0.9.1 @@ -25,23 +25,23 @@ collections: # Collections for Infrastructure from Ansible Galaxy - name: cloud.terraform type: galaxy - version: 1.1.0 + version: 3.0.0 - name: amazon.aws type: galaxy - version: 7.2.0 + version: 9.0.0 - name: community.aws type: galaxy - version: 7.1.0 + version: 9.0.0 - name: azure.azcollection type: galaxy - version: 2.2.0 + version: 3.0.1 - name: google.cloud type: galaxy version: 1.1.3 # Replace with ibm.cloud in future, legacy Ansible Collection uses hidden on-the-fly Terraform files in /var/tmp/ansible/ibmcloud) - name: ibm.cloudcollection type: galaxy - version: 1.51.0 + version: 1.71.2 - name: ovirt.ovirt type: galaxy version: 3.1.2 @@ -53,21 +53,12 @@ collections: version: 3.0.0 - name: cloud.common type: galaxy - version: 3.0.0 + version: 4.0.0 # Collections from public repositories via HTTPS # - name: https://github.com/sap-linuxlab/community.sap_install.git # type: git # version: dev -# - name: https://github.com/sap-linuxlab/community.sap_launchpad.git -# type: git -# version: main -# - name: https://github.com/sap-linuxlab/community.sap_operations.git -# type: git -# version: main -# - name: https://github.com/ansible-collections/cloud.terraform.git -# type: git -# version: main # Collections from private repositories via use SSH (embedded GitHub PAT does not work) # Used for customised/forked Ansible Collections diff --git a/deploy_scenarios/sap_ides_ecc_hana_sandbox/optional/ansible_extravars_noninteractive.yml b/deploy_scenarios/sap_ides_ecc_hana_sandbox/optional/ansible_extravars_noninteractive.yml index 9b78ffc..1aad3ee 100755 --- a/deploy_scenarios/sap_ides_ecc_hana_sandbox/optional/ansible_extravars_noninteractive.yml +++ b/deploy_scenarios/sap_ides_ecc_hana_sandbox/optional/ansible_extravars_noninteractive.yml @@ -113,13 +113,14 @@ sap_vm_provision_ibmcloud_vpc_sg_names: "ENTER_STRING_VALUE_HERE,ENTER_STRING_VA #### sap_vm_provision_ibmcloud_api_key: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ibmcloud_resource_group_name: "ENTER_STRING_VALUE_HERE" # if ansible_to_terraform, use "new" -sap_vm_provision_ibmcloud_private_dns_instance_name: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_private_dns_instance_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform sap_vm_provision_ibmcloud_powervs_location: "ENTER_STRING_VALUE_HERE" -sap_vm_provision_ibmcloud_powervs_workspace_name: "ENTER_STRING_VALUE_HERE" -sap_vm_provision_ibmcloud_powervs_vlan_subnet_name: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_powervs_workspace_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform +sap_vm_provision_ibmcloud_powervs_vlan_subnet_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform sap_vm_provision_ibmcloud_powervs_host_os_image: "ENTER_STRING_VALUE_HERE" sap_vm_provision_bastion_user: "ENTER_STRING_VALUE_HERE" sap_vm_provision_bastion_ssh_port: "ENTER_STRING_VALUE_HERE" +# sap_vm_provision_ibmcloud_vpc_subnet_name: "ENTER_STRING_VALUE_HERE" # only for ansible_to_terraform, can be name or 'new' # Only for use when 'ansible' is value provided for variable sap_vm_provision_iac_type #### @@ -127,6 +128,7 @@ sap_vm_provision_bastion_public_ip: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ssh_bastion_private_key_file_path: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ssh_host_private_key_file_path: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ibmcloud_powervs_key_pair_name_ssh_host_public_key: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_private_dns_custom_resolver_ip: "ENTER_STRING_VALUE_HERE" # sap_vm_provision_ibmcloud_private_dns_resource_group_name: "" # optional, default use of sap_vm_provision_ibmcloud_resource_group_name sap_vm_provision_proxy_web_forward_proxy_ip: "ENTER_STRING_VALUE_HERE" # IP:Port only, no http:// prefix sap_vm_provision_proxy_web_forward_exclusions: "localhost,127.0.0.1,{{ sap_vm_provision_dns_root_domain }}" @@ -328,7 +330,7 @@ sap_id_user: "ENTER_STRING_VALUE_HERE" sap_id_user_password: 'ENTER_STRING_VALUE_HERE' # Directory for SAP installation media -sap_software_download_directory: "ENTER_STRING_VALUE_HERE" +sap_install_media_detect_source_directory: "ENTER_STRING_VALUE_HERE" # e.g. /software #### diff --git a/deploy_scenarios/sap_ides_ecc_ibmdb2_sandbox/ansible_extravars.yml b/deploy_scenarios/sap_ides_ecc_ibmdb2_sandbox/ansible_extravars.yml index 4067105..5cd6b68 100755 --- a/deploy_scenarios/sap_ides_ecc_ibmdb2_sandbox/ansible_extravars.yml +++ b/deploy_scenarios/sap_ides_ecc_ibmdb2_sandbox/ansible_extravars.yml @@ -240,27 +240,43 @@ sap_swpm_templates_install_dictionary: sap_vm_provision_aws_ec2_vs_host_os_image_dictionary: rhel-8-1: "*RHEL-8.1*_HVM*x86_64*" - rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" + # rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" # removed rhel-8-4: "*RHEL-8.4*_HVM*x86_64*" rhel-8-6: "*RHEL-8.6*_HVM*x86_64*" rhel-8-8: "*RHEL-8.8*_HVM*x86_64*" + rhel-8-10: "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0: "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1: "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2: "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3: "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4: "*RHEL-9.4*_HVM*x86_64*" + sles-12-5: "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" # removed + # sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" # removed + # sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" # removed + sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6: "*suse-sles-15-sp6-v202*-hvm-ssd-x86_64*" + # rhel-7-7-sap-ha: "*RHEL-SAP-8.1.0*" # removed + # rhel-7-9-sap-ha: "*RHEL-SAP-8.1.0*" # removed rhel-8-1-sap-ha: "*RHEL-SAP-8.1.0*" rhel-8-2-sap-ha: "*RHEL-SAP-8.2.0*" rhel-8-4-sap-ha: "*RHEL-SAP-8.4.0*" rhel-8-6-sap-ha: "*RHEL-SAP-8.6.0*" rhel-8-8-sap-ha: "*RHEL-SAP-8.8.0*" + rhel-8-10-sap-ha: "*RHEL-SAP-8.10.0*" rhel-9-0-sap-ha: "*RHEL-SAP-9.0.0*" rhel-9-2-sap-ha: "*RHEL-SAP-9.2.0*" - sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" - sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" - sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" - sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + rhel-9-4-sap-ha: "*RHEL-SAP-9.4.0*" sles-12-5-sap-ha: "*suse-sles-sap-12-sp5-v202*-hvm-ssd-x86_64*" sles-15-1-sap-ha: "*suse-sles-sap-15-sp1-v202*-hvm-ssd-x86_64*" sles-15-2-sap-ha: "*suse-sles-sap-15-sp2-v202*-hvm-ssd-x86_64*" sles-15-3-sap-ha: "*suse-sles-sap-15-sp3-v202*-hvm-ssd-x86_64*" sles-15-4-sap-ha: "*suse-sles-sap-15-sp4-v202*-hvm-ssd-x86_64*" sles-15-5-sap-ha: "*suse-sles-sap-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha: "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" + sles-15-4-sap-ha-byos: "*suse-sles-sap-15-sp4-byos-v202*-hvm-ssd-x86_64*" + sles-15-5-sap-ha-byos: "*suse-sles-sap-15-sp5-byos-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha-byos: "*suse-sles-sap-15-sp6-byos-v202*-hvm-ssd-x86_64*" sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: @@ -328,42 +344,75 @@ sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: #### sap_vm_provision_gcp_ce_vm_host_os_image_dictionary: - rhel-8-latest: project: "rhel-cloud" family: "rhel-8" - - rhel-8-1-sap-ha: + rhel-9-latest: + project: "rhel-cloud" + family: "rhel-9" + sles-12-latest: + project: "suse-cloud" + family: "sles-12" + sles-15-latest: + project: "suse-cloud" + family: "sles-15" + # rhel-7-7-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-7-7-sap-ha" + rhel-7-9-sap-ha: project: "rhel-sap-cloud" - family: "rhel-8-1-sap-ha" - + family: "rhel-7-9-sap-ha" + # rhel-8-1-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-8-1-sap-ha" rhel-8-2-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-2-sap-ha" - rhel-8-4-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-4-sap-ha" - rhel-8-6-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-6-sap-ha" - - sles-15-latest: - project: "suse-cloud" - family: "sles-15" - - sles-15-sp3-sap: + sles-12-5-sap-ha: + project: "suse-sap-cloud" + family: "sles-12-sp5-sap" + # sles-15-1-sap-ha: # removed + # project: "suse-sap-cloud" + # family: "sles-15-sp1-sap" + sles-15-2-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp2-sap" + sles-15-3-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp3-sap" - - sles-15-sp4-sap: + sles-15-4-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp4-sap" - - sles-15-sp5-sap: + sles-15-5-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp5-sap" + sles-15-6-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp6-sap" + sles-12-5-sap-ha-byos: + project: "suse-byos-cloud" + family: "sles-12-sp5-sap-byos" + sles-15-2-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp2-sap-byos" + sles-15-3-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp3-sap-byos" + sles-15-4-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp4-sap-byos" + sles-15-5-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp5-sap-byos" + sles-15-6-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp6-sap-byos" sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: @@ -436,16 +485,31 @@ sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: sap_vm_provision_ibmcloud_vs_host_os_image_dictionary: rhel-8-4: ".*redhat.*8-4.*minimal.*amd64.*" rhel-8-6: ".*redhat.*8-6.*minimal.*amd64.*" + rhel-8-8: ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10: ".*redhat.*8-10.*minimal.*amd64.*" rhel-9-0: ".*redhat.*9-0.*minimal.*amd64.*" rhel-9-2: ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4: ".*redhat.*9-4.*minimal.*amd64.*" + sles-15-5: ".*sles.*15-5.*amd64-[0-9]" + sles-15-6: ".*sles.*15-6.*amd64-[0-9]" + # rhel-7-6-sap-ha: ".*redhat.*7-6.*amd64.*hana.*" # retrievable from deprecated list + # rhel-7-9-sap-ha: ".*redhat.*7-9.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-1-sap-ha: ".*redhat.*8-1.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-2-sap-ha: ".*redhat.*8-2.*amd64.*hana.*" # retrievable from deprecated list rhel-8-4-sap-ha: ".*redhat.*8-4.*amd64.*hana.*" rhel-8-6-sap-ha: ".*redhat.*8-6.*amd64.*hana.*" rhel-8-8-sap-ha: ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha: ".*redhat.*8-10.*amd64.*hana.*" rhel-9-0-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" - rhel-9-2-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha: ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha: ".*redhat.*9-4.*amd64.*hana.*" + # sles-12-4-sap-ha: ".*sles.*12-4.*amd64.*hana.*" # retrievable from deprecated list + # sles-12-5-sap-ha: ".*sles.*12-5.*amd64.*hana.*" # retrievable from deprecated list + # sles-15-1-sap-ha: ".*sles.*15-1.*amd64.*hana.*" # retrievable from deprecated list sles-15-3-sap-ha: ".*sles.*15-3.*amd64.*hana.*" sles-15-4-sap-ha: ".*sles.*15-4.*amd64.*hana.*" sles-15-5-sap-ha: ".*sles.*15-5.*amd64.*hana.*" + sles-15-6-sap-ha: ".*sles.*15-6.*amd64.*hana.*" sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: @@ -518,96 +582,186 @@ sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: #### sap_vm_provision_msazure_vm_host_os_image_dictionary: - + rhel-8-0: + publisher: "RedHat" + offer: "RHEL" + sku: "8-gen2" + rhel-8-1: + publisher: "RedHat" + offer: "RHEL" + sku: "81-gen2" + rhel-8-2: + publisher: "RedHat" + offer: "RHEL" + sku: "82-gen2" + rhel-8-3: + publisher: "RedHat" + offer: "RHEL" + sku: "83-gen2" rhel-8-4: publisher: "RedHat" offer: "RHEL" sku: "84-gen2" - + rhel-8-5: + publisher: "RedHat" + offer: "RHEL" + sku: "85-gen2" + rhel-8-6: + publisher: "RedHat" + offer: "RHEL" + sku: "86-gen2" + rhel-8-7: + publisher: "RedHat" + offer: "RHEL" + sku: "87-gen2" + rhel-8-8: + publisher: "RedHat" + offer: "RHEL" + sku: "88-gen2" + rhel-8-9: + publisher: "RedHat" + offer: "RHEL" + sku: "89-gen2" + rhel-8-10: + publisher: "RedHat" + offer: "RHEL" + sku: "810-gen2" + rhel-9-0: + publisher: "RedHat" + offer: "RHEL" + sku: "90-gen2" + rhel-9-1: + publisher: "RedHat" + offer: "RHEL" + sku: "91-gen2" + rhel-9-2: + publisher: "RedHat" + offer: "RHEL" + sku: "92-gen2" + rhel-9-3: + publisher: "RedHat" + offer: "RHEL" + sku: "93-gen2" + rhel-9-4: + publisher: "RedHat" + offer: "RHEL" + sku: "94-gen2" + sles-12-5: + publisher: "SUSE" + offer: "sles-12-sp5" + sku: "gen2" + sles-15-1: + publisher: "SUSE" + offer: "sles-15-sp1" + sku: "gen2" + sles-15-2: + publisher: "SUSE" + offer: "sles-15-sp2" + sku: "gen2" + sles-15-3: + publisher: "SUSE" + offer: "sles-15-sp3" + sku: "gen2" + sles-15-4: + publisher: "SUSE" + offer: "sles-15-sp4" + sku: "gen2" + sles-15-5: + publisher: "SUSE" + offer: "sles-15-sp5" + sku: "gen2" + sles-15-6: + publisher: "SUSE" + offer: "sles-15-sp6" + sku: "gen2" rhel-8-1-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "81sapha-gen2" - rhel-8-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "82sapha-gen2" - rhel-8-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "84sapha-gen2" - rhel-8-6-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "86sapha-gen2" - rhel-8-8-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "88sapha-gen2" - + rhel-8-10-sap-ha: + publisher: "RedHat" + offer: "RHEL-SAP-HA" + sku: "810sapha-gen2" rhel-9-0-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "90sapha-gen2" - rhel-9-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "92sapha-gen2" - - rhel-8-1-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "81sapapps-gen2" - - rhel-8-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "82sapapps-gen2" - - rhel-8-4-sap-applications: + rhel-9-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" - sku: "84sapapps-gen2" - - rhel-8-6-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "86sapapps-gen2" - - rhel-8-8-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "88sapapps-gen2" - - rhel-9-0-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "90sapapps-gen2" - - rhel-9-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "92sapapps-gen2" - - sles-15-sp3-sap: + sku: "94sapha-gen2" + sles-12-5-sap-ha: + publisher: "SUSE" + offer: "sles-sap-12-sp5" + sku: "gen2" + sles-15-1-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp1" + sku: "gen2" + sles-15-2-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp2" + sku: "gen2" + sles-15-3-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp3" sku: "gen2" - - sles-15-sp4-sap: + sles-15-4-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp4" sku: "gen2" - - sles-15-sp5-sap: + sles-15-5-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp5" sku: "gen2" + sles-15-6-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp6" + sku: "gen2" + sles-15-1-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp1-byos" + sku: "gen2" + sles-15-2-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp2-byos" + sku: "gen2" + sles-15-3-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp3-byos" + sku: "gen2" + sles-15-4-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp4-byos" + sku: "gen2" + sles-15-5-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp5-byos" + sku: "gen2" + sles-15-6-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp6-byos" + sku: "gen2" sap_vm_provision_msazure_vm_host_specifications_dictionary: diff --git a/deploy_scenarios/sap_ides_ecc_ibmdb2_sandbox/ansible_requirements.yml b/deploy_scenarios/sap_ides_ecc_ibmdb2_sandbox/ansible_requirements.yml index af7ed22..1454ec5 100644 --- a/deploy_scenarios/sap_ides_ecc_ibmdb2_sandbox/ansible_requirements.yml +++ b/deploy_scenarios/sap_ides_ecc_ibmdb2_sandbox/ansible_requirements.yml @@ -8,16 +8,16 @@ collections: version: 6.1.0 - name: fedora.linux_system_roles type: galaxy - version: 1.82.0 + version: 1.88.9 - name: community.sap_install type: galaxy - version: 1.4.0 + version: 1.5.0 - name: community.sap_launchpad type: galaxy - version: 1.1.0 + version: 1.1.1 - name: community.sap_infrastructure type: galaxy - version: 1.0.1 + version: 1.1.0 # - name: community.sap_operations # type: galaxy # version: 0.9.1 @@ -25,23 +25,23 @@ collections: # Collections for Infrastructure from Ansible Galaxy - name: cloud.terraform type: galaxy - version: 1.1.0 + version: 3.0.0 - name: amazon.aws type: galaxy - version: 7.2.0 + version: 9.0.0 - name: community.aws type: galaxy - version: 7.1.0 + version: 9.0.0 - name: azure.azcollection type: galaxy - version: 2.2.0 + version: 3.0.1 - name: google.cloud type: galaxy version: 1.1.3 # Replace with ibm.cloud in future, legacy Ansible Collection uses hidden on-the-fly Terraform files in /var/tmp/ansible/ibmcloud) - name: ibm.cloudcollection type: galaxy - version: 1.51.0 + version: 1.71.2 - name: ovirt.ovirt type: galaxy version: 3.1.2 @@ -53,21 +53,12 @@ collections: version: 3.0.0 - name: cloud.common type: galaxy - version: 3.0.0 + version: 4.0.0 # Collections from public repositories via HTTPS # - name: https://github.com/sap-linuxlab/community.sap_install.git # type: git # version: dev -# - name: https://github.com/sap-linuxlab/community.sap_launchpad.git -# type: git -# version: main -# - name: https://github.com/sap-linuxlab/community.sap_operations.git -# type: git -# version: main -# - name: https://github.com/ansible-collections/cloud.terraform.git -# type: git -# version: main # Collections from private repositories via use SSH (embedded GitHub PAT does not work) # Used for customised/forked Ansible Collections diff --git a/deploy_scenarios/sap_ides_ecc_ibmdb2_sandbox/optional/ansible_extravars_noninteractive.yml b/deploy_scenarios/sap_ides_ecc_ibmdb2_sandbox/optional/ansible_extravars_noninteractive.yml index fcc0d2f..18dbd22 100755 --- a/deploy_scenarios/sap_ides_ecc_ibmdb2_sandbox/optional/ansible_extravars_noninteractive.yml +++ b/deploy_scenarios/sap_ides_ecc_ibmdb2_sandbox/optional/ansible_extravars_noninteractive.yml @@ -270,7 +270,7 @@ sap_id_user: "ENTER_STRING_VALUE_HERE" sap_id_user_password: 'ENTER_STRING_VALUE_HERE' # Directory for SAP installation media -sap_software_download_directory: "ENTER_STRING_VALUE_HERE" +sap_install_media_detect_source_directory: "ENTER_STRING_VALUE_HERE" # e.g. /software #### diff --git a/deploy_scenarios/sap_landscape_s4hana_standard/ansible_extravars.yml b/deploy_scenarios/sap_landscape_s4hana_standard/ansible_extravars.yml index 821d3b5..923f776 100755 --- a/deploy_scenarios/sap_landscape_s4hana_standard/ansible_extravars.yml +++ b/deploy_scenarios/sap_landscape_s4hana_standard/ansible_extravars.yml @@ -865,27 +865,43 @@ sap_swpm_templates_install_dictionary: sap_vm_provision_aws_ec2_vs_host_os_image_dictionary: rhel-8-1: "*RHEL-8.1*_HVM*x86_64*" - rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" + # rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" # removed rhel-8-4: "*RHEL-8.4*_HVM*x86_64*" rhel-8-6: "*RHEL-8.6*_HVM*x86_64*" rhel-8-8: "*RHEL-8.8*_HVM*x86_64*" + rhel-8-10: "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0: "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1: "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2: "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3: "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4: "*RHEL-9.4*_HVM*x86_64*" + sles-12-5: "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" # removed + # sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" # removed + # sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" # removed + sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6: "*suse-sles-15-sp6-v202*-hvm-ssd-x86_64*" + # rhel-7-7-sap-ha: "*RHEL-SAP-8.1.0*" # removed + # rhel-7-9-sap-ha: "*RHEL-SAP-8.1.0*" # removed rhel-8-1-sap-ha: "*RHEL-SAP-8.1.0*" rhel-8-2-sap-ha: "*RHEL-SAP-8.2.0*" rhel-8-4-sap-ha: "*RHEL-SAP-8.4.0*" rhel-8-6-sap-ha: "*RHEL-SAP-8.6.0*" rhel-8-8-sap-ha: "*RHEL-SAP-8.8.0*" + rhel-8-10-sap-ha: "*RHEL-SAP-8.10.0*" rhel-9-0-sap-ha: "*RHEL-SAP-9.0.0*" rhel-9-2-sap-ha: "*RHEL-SAP-9.2.0*" - sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" - sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" - sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" - sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + rhel-9-4-sap-ha: "*RHEL-SAP-9.4.0*" sles-12-5-sap-ha: "*suse-sles-sap-12-sp5-v202*-hvm-ssd-x86_64*" sles-15-1-sap-ha: "*suse-sles-sap-15-sp1-v202*-hvm-ssd-x86_64*" sles-15-2-sap-ha: "*suse-sles-sap-15-sp2-v202*-hvm-ssd-x86_64*" sles-15-3-sap-ha: "*suse-sles-sap-15-sp3-v202*-hvm-ssd-x86_64*" sles-15-4-sap-ha: "*suse-sles-sap-15-sp4-v202*-hvm-ssd-x86_64*" sles-15-5-sap-ha: "*suse-sles-sap-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha: "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" + sles-15-4-sap-ha-byos: "*suse-sles-sap-15-sp4-byos-v202*-hvm-ssd-x86_64*" + sles-15-5-sap-ha-byos: "*suse-sles-sap-15-sp5-byos-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha-byos: "*suse-sles-sap-15-sp6-byos-v202*-hvm-ssd-x86_64*" sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: @@ -1223,42 +1239,75 @@ sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: #### sap_vm_provision_gcp_ce_vm_host_os_image_dictionary: - rhel-8-latest: project: "rhel-cloud" family: "rhel-8" - - rhel-8-1-sap-ha: + rhel-9-latest: + project: "rhel-cloud" + family: "rhel-9" + sles-12-latest: + project: "suse-cloud" + family: "sles-12" + sles-15-latest: + project: "suse-cloud" + family: "sles-15" + # rhel-7-7-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-7-7-sap-ha" + rhel-7-9-sap-ha: project: "rhel-sap-cloud" - family: "rhel-8-1-sap-ha" - + family: "rhel-7-9-sap-ha" + # rhel-8-1-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-8-1-sap-ha" rhel-8-2-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-2-sap-ha" - rhel-8-4-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-4-sap-ha" - rhel-8-6-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-6-sap-ha" - - sles-15-latest: - project: "suse-cloud" - family: "sles-15" - - sles-15-sp3-sap: + sles-12-5-sap-ha: + project: "suse-sap-cloud" + family: "sles-12-sp5-sap" + # sles-15-1-sap-ha: # removed + # project: "suse-sap-cloud" + # family: "sles-15-sp1-sap" + sles-15-2-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp2-sap" + sles-15-3-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp3-sap" - - sles-15-sp4-sap: + sles-15-4-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp4-sap" - - sles-15-sp5-sap: + sles-15-5-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp5-sap" + sles-15-6-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp6-sap" + sles-12-5-sap-ha-byos: + project: "suse-byos-cloud" + family: "sles-12-sp5-sap-byos" + sles-15-2-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp2-sap-byos" + sles-15-3-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp3-sap-byos" + sles-15-4-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp4-sap-byos" + sles-15-5-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp5-sap-byos" + sles-15-6-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp6-sap-byos" sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: @@ -1626,16 +1675,31 @@ sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: sap_vm_provision_ibmcloud_vs_host_os_image_dictionary: rhel-8-4: ".*redhat.*8-4.*minimal.*amd64.*" rhel-8-6: ".*redhat.*8-6.*minimal.*amd64.*" + rhel-8-8: ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10: ".*redhat.*8-10.*minimal.*amd64.*" rhel-9-0: ".*redhat.*9-0.*minimal.*amd64.*" rhel-9-2: ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4: ".*redhat.*9-4.*minimal.*amd64.*" + sles-15-5: ".*sles.*15-5.*amd64-[0-9]" + sles-15-6: ".*sles.*15-6.*amd64-[0-9]" + # rhel-7-6-sap-ha: ".*redhat.*7-6.*amd64.*hana.*" # retrievable from deprecated list + # rhel-7-9-sap-ha: ".*redhat.*7-9.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-1-sap-ha: ".*redhat.*8-1.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-2-sap-ha: ".*redhat.*8-2.*amd64.*hana.*" # retrievable from deprecated list rhel-8-4-sap-ha: ".*redhat.*8-4.*amd64.*hana.*" rhel-8-6-sap-ha: ".*redhat.*8-6.*amd64.*hana.*" rhel-8-8-sap-ha: ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha: ".*redhat.*8-10.*amd64.*hana.*" rhel-9-0-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" - rhel-9-2-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha: ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha: ".*redhat.*9-4.*amd64.*hana.*" + # sles-12-4-sap-ha: ".*sles.*12-4.*amd64.*hana.*" # retrievable from deprecated list + # sles-12-5-sap-ha: ".*sles.*12-5.*amd64.*hana.*" # retrievable from deprecated list + # sles-15-1-sap-ha: ".*sles.*15-1.*amd64.*hana.*" # retrievable from deprecated list sles-15-3-sap-ha: ".*sles.*15-3.*amd64.*hana.*" sles-15-4-sap-ha: ".*sles.*15-4.*amd64.*hana.*" sles-15-5-sap-ha: ".*sles.*15-5.*amd64.*hana.*" + sles-15-6-sap-ha: ".*sles.*15-6.*amd64.*hana.*" sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: @@ -1998,17 +2062,26 @@ sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: # Full Linux subscription ppc64le OS Images with support and activation keys sap_vm_provision_ibmcloud_powervs_host_os_image_dictionary: - rhel-8-4: ".*RHEL.*8.*4" - rhel-8-6: ".*RHEL.*8.*6" + rhel-8-8: ".*RHEL.*8.*8" rhel-9-2: ".*RHEL.*9.*2" - sles-15-3: ".*SLES.*15.*3" - sles-15-4: ".*SLES.*15.*4" + rhel-9-4: ".*RHEL.*9.*4" + sles-15-5: ".*SLES.*15.*5$" + rhel-8-4-sap-ha: "RHEL8-SP4-SAP" rhel-8-6-sap-ha: ".*RHEL.*8.*6.*SAP$" # ensure string suffix using $ rhel-8-8-sap-ha: ".*RHEL.*8.*8.*SAP$" # ensure string suffix using $ rhel-9-2-sap-ha: ".*RHEL.*9.*2.*SAP$" # ensure string suffix using $ sles-15-2-sap-ha: ".*SLES.*15.*2.*SAP$" # ensure string suffix using $ sles-15-3-sap-ha: ".*SLES.*15.*3.*SAP$" # ensure string suffix using $ sles-15-4-sap-ha: ".*SLES.*15.*4.*SAP$" # ensure string suffix using $ + sles-15-5-sap-ha: "SLES15-SP5-SAP" + # rhel-8-4-sap-ha-byol: "RHEL8-SP4-SAP-BYOL" + # rhel-8-6-sap-ha-byol: ".*RHEL.*8.*6.*SAP-BYOL$" # ensure string suffix using $ + # rhel-8-8-sap-ha-byol: ".*RHEL.*8.*8.*SAP-BYOL$" # ensure string suffix using $ + # rhel-9-2-sap-ha-byol: ".*RHEL.*9.*2.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-2-sap-ha-byol: ".*SLES.*15.*2.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-3-sap-ha-byol: ".*SLES.*15.*3.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-4-sap-ha-byol: ".*SLES.*15.*4.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-5-sap-ha-byol: "SLES15-SP5-SAP-BYOL" sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: @@ -2075,7 +2148,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: - name: swap # hdb swap_path: /swapfile # use swap file on root disk, instead of creating LVM LV for swap disk_size: 2 - disk_type: tier3 + disk_type: tier1 filesystem_type: swap # must be swap filesystem - name: software @@ -2181,7 +2254,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: - name: swap # hdb swap_path: /swapfile # use swap file on root disk, instead of creating LVM LV for swap disk_size: 2 - disk_type: tier3 + disk_type: tier1 filesystem_type: swap # must be swap filesystem - name: software @@ -2287,7 +2360,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: - name: swap # hdb swap_path: /swapfile # use swap file on root disk, instead of creating LVM LV for swap disk_size: 2 - disk_type: tier3 + disk_type: tier1 filesystem_type: swap # must be swap filesystem - name: software @@ -2352,96 +2425,186 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: #### sap_vm_provision_msazure_vm_host_os_image_dictionary: - + rhel-8-0: + publisher: "RedHat" + offer: "RHEL" + sku: "8-gen2" + rhel-8-1: + publisher: "RedHat" + offer: "RHEL" + sku: "81-gen2" + rhel-8-2: + publisher: "RedHat" + offer: "RHEL" + sku: "82-gen2" + rhel-8-3: + publisher: "RedHat" + offer: "RHEL" + sku: "83-gen2" rhel-8-4: publisher: "RedHat" offer: "RHEL" sku: "84-gen2" - + rhel-8-5: + publisher: "RedHat" + offer: "RHEL" + sku: "85-gen2" + rhel-8-6: + publisher: "RedHat" + offer: "RHEL" + sku: "86-gen2" + rhel-8-7: + publisher: "RedHat" + offer: "RHEL" + sku: "87-gen2" + rhel-8-8: + publisher: "RedHat" + offer: "RHEL" + sku: "88-gen2" + rhel-8-9: + publisher: "RedHat" + offer: "RHEL" + sku: "89-gen2" + rhel-8-10: + publisher: "RedHat" + offer: "RHEL" + sku: "810-gen2" + rhel-9-0: + publisher: "RedHat" + offer: "RHEL" + sku: "90-gen2" + rhel-9-1: + publisher: "RedHat" + offer: "RHEL" + sku: "91-gen2" + rhel-9-2: + publisher: "RedHat" + offer: "RHEL" + sku: "92-gen2" + rhel-9-3: + publisher: "RedHat" + offer: "RHEL" + sku: "93-gen2" + rhel-9-4: + publisher: "RedHat" + offer: "RHEL" + sku: "94-gen2" + sles-12-5: + publisher: "SUSE" + offer: "sles-12-sp5" + sku: "gen2" + sles-15-1: + publisher: "SUSE" + offer: "sles-15-sp1" + sku: "gen2" + sles-15-2: + publisher: "SUSE" + offer: "sles-15-sp2" + sku: "gen2" + sles-15-3: + publisher: "SUSE" + offer: "sles-15-sp3" + sku: "gen2" + sles-15-4: + publisher: "SUSE" + offer: "sles-15-sp4" + sku: "gen2" + sles-15-5: + publisher: "SUSE" + offer: "sles-15-sp5" + sku: "gen2" + sles-15-6: + publisher: "SUSE" + offer: "sles-15-sp6" + sku: "gen2" rhel-8-1-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "81sapha-gen2" - rhel-8-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "82sapha-gen2" - rhel-8-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "84sapha-gen2" - rhel-8-6-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "86sapha-gen2" - rhel-8-8-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "88sapha-gen2" - + rhel-8-10-sap-ha: + publisher: "RedHat" + offer: "RHEL-SAP-HA" + sku: "810sapha-gen2" rhel-9-0-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "90sapha-gen2" - rhel-9-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "92sapha-gen2" - - rhel-8-1-sap-applications: + rhel-9-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" - sku: "81sapapps-gen2" - - rhel-8-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "82sapapps-gen2" - - rhel-8-4-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "84sapapps-gen2" - - rhel-8-6-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "86sapapps-gen2" - - rhel-8-8-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "88sapapps-gen2" - - rhel-9-0-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "90sapapps-gen2" - - rhel-9-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "92sapapps-gen2" - - sles-15-sp3-sap: + sku: "94sapha-gen2" + sles-12-5-sap-ha: + publisher: "SUSE" + offer: "sles-sap-12-sp5" + sku: "gen2" + sles-15-1-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp1" + sku: "gen2" + sles-15-2-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp2" + sku: "gen2" + sles-15-3-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp3" sku: "gen2" - - sles-15-sp4-sap: + sles-15-4-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp4" sku: "gen2" - - sles-15-sp5-sap: + sles-15-5-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp5" sku: "gen2" + sles-15-6-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp6" + sku: "gen2" + sles-15-1-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp1-byos" + sku: "gen2" + sles-15-2-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp2-byos" + sku: "gen2" + sles-15-3-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp3-byos" + sku: "gen2" + sles-15-4-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp4-byos" + sku: "gen2" + sles-15-5-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp5-byos" + sku: "gen2" + sles-15-6-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp6-byos" + sku: "gen2" sap_vm_provision_msazure_vm_host_specifications_dictionary: @@ -3627,7 +3790,7 @@ sap_vm_provision_vmware_vm_host_specifications_dictionary: - name: swap # hdb swap_path: /swapfile # use swap file on root disk, instead of creating LVM LV for swap disk_size: 2 - disk_type: tier3 + disk_type: tier1 filesystem_type: swap # must be swap filesystem - name: software @@ -3737,7 +3900,7 @@ sap_vm_provision_vmware_vm_host_specifications_dictionary: - name: swap # hdb swap_path: /swapfile # use swap file on root disk, instead of creating LVM LV for swap disk_size: 2 - disk_type: tier3 + disk_type: tier1 filesystem_type: swap # must be swap filesystem - name: software diff --git a/deploy_scenarios/sap_landscape_s4hana_standard/ansible_requirements.yml b/deploy_scenarios/sap_landscape_s4hana_standard/ansible_requirements.yml index af7ed22..1454ec5 100644 --- a/deploy_scenarios/sap_landscape_s4hana_standard/ansible_requirements.yml +++ b/deploy_scenarios/sap_landscape_s4hana_standard/ansible_requirements.yml @@ -8,16 +8,16 @@ collections: version: 6.1.0 - name: fedora.linux_system_roles type: galaxy - version: 1.82.0 + version: 1.88.9 - name: community.sap_install type: galaxy - version: 1.4.0 + version: 1.5.0 - name: community.sap_launchpad type: galaxy - version: 1.1.0 + version: 1.1.1 - name: community.sap_infrastructure type: galaxy - version: 1.0.1 + version: 1.1.0 # - name: community.sap_operations # type: galaxy # version: 0.9.1 @@ -25,23 +25,23 @@ collections: # Collections for Infrastructure from Ansible Galaxy - name: cloud.terraform type: galaxy - version: 1.1.0 + version: 3.0.0 - name: amazon.aws type: galaxy - version: 7.2.0 + version: 9.0.0 - name: community.aws type: galaxy - version: 7.1.0 + version: 9.0.0 - name: azure.azcollection type: galaxy - version: 2.2.0 + version: 3.0.1 - name: google.cloud type: galaxy version: 1.1.3 # Replace with ibm.cloud in future, legacy Ansible Collection uses hidden on-the-fly Terraform files in /var/tmp/ansible/ibmcloud) - name: ibm.cloudcollection type: galaxy - version: 1.51.0 + version: 1.71.2 - name: ovirt.ovirt type: galaxy version: 3.1.2 @@ -53,21 +53,12 @@ collections: version: 3.0.0 - name: cloud.common type: galaxy - version: 3.0.0 + version: 4.0.0 # Collections from public repositories via HTTPS # - name: https://github.com/sap-linuxlab/community.sap_install.git # type: git # version: dev -# - name: https://github.com/sap-linuxlab/community.sap_launchpad.git -# type: git -# version: main -# - name: https://github.com/sap-linuxlab/community.sap_operations.git -# type: git -# version: main -# - name: https://github.com/ansible-collections/cloud.terraform.git -# type: git -# version: main # Collections from private repositories via use SSH (embedded GitHub PAT does not work) # Used for customised/forked Ansible Collections diff --git a/deploy_scenarios/sap_landscape_s4hana_standard/optional/ansible_extravars_noninteractive.yml b/deploy_scenarios/sap_landscape_s4hana_standard/optional/ansible_extravars_noninteractive.yml index 8d9a42d..850f69e 100755 --- a/deploy_scenarios/sap_landscape_s4hana_standard/optional/ansible_extravars_noninteractive.yml +++ b/deploy_scenarios/sap_landscape_s4hana_standard/optional/ansible_extravars_noninteractive.yml @@ -131,13 +131,14 @@ sap_vm_provision_ibmcloud_vpc_sg_names: "ENTER_STRING_VALUE_HERE,ENTER_STRING_VA #### sap_vm_provision_ibmcloud_api_key: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ibmcloud_resource_group_name: "ENTER_STRING_VALUE_HERE" # if ansible_to_terraform, use "new" -sap_vm_provision_ibmcloud_private_dns_instance_name: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_private_dns_instance_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform sap_vm_provision_ibmcloud_powervs_location: "ENTER_STRING_VALUE_HERE" -sap_vm_provision_ibmcloud_powervs_workspace_name: "ENTER_STRING_VALUE_HERE" -sap_vm_provision_ibmcloud_powervs_vlan_subnet_name: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_powervs_workspace_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform +sap_vm_provision_ibmcloud_powervs_vlan_subnet_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform sap_vm_provision_ibmcloud_powervs_host_os_image: "ENTER_STRING_VALUE_HERE" sap_vm_provision_bastion_user: "ENTER_STRING_VALUE_HERE" sap_vm_provision_bastion_ssh_port: "ENTER_STRING_VALUE_HERE" +# sap_vm_provision_ibmcloud_vpc_subnet_name: "ENTER_STRING_VALUE_HERE" # only for ansible_to_terraform, can be name or 'new' # Only for use when 'ansible' is value provided for variable sap_vm_provision_iac_type #### @@ -145,6 +146,7 @@ sap_vm_provision_bastion_public_ip: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ssh_bastion_private_key_file_path: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ssh_host_private_key_file_path: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ibmcloud_powervs_key_pair_name_ssh_host_public_key: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_private_dns_custom_resolver_ip: "ENTER_STRING_VALUE_HERE" # sap_vm_provision_ibmcloud_private_dns_resource_group_name: "" # optional, default use of sap_vm_provision_ibmcloud_resource_group_name sap_vm_provision_proxy_web_forward_proxy_ip: "ENTER_STRING_VALUE_HERE" # IP:Port only, no http:// prefix sap_vm_provision_proxy_web_forward_exclusions: "localhost,127.0.0.1,{{ sap_vm_provision_dns_root_domain }}" @@ -317,7 +319,7 @@ sap_id_user: "ENTER_STRING_VALUE_HERE" sap_id_user_password: 'ENTER_STRING_VALUE_HERE' # Directory for SAP installation media -sap_software_download_directory: "ENTER_STRING_VALUE_HERE" +sap_install_media_detect_source_directory: "ENTER_STRING_VALUE_HERE" # e.g. /software #### diff --git a/deploy_scenarios/sap_landscape_s4hana_standard_maintplan/ansible_extravars.yml b/deploy_scenarios/sap_landscape_s4hana_standard_maintplan/ansible_extravars.yml index 473303c..4503cb7 100755 --- a/deploy_scenarios/sap_landscape_s4hana_standard_maintplan/ansible_extravars.yml +++ b/deploy_scenarios/sap_landscape_s4hana_standard_maintplan/ansible_extravars.yml @@ -363,27 +363,43 @@ sap_swpm_templates_install_dictionary: sap_vm_provision_aws_ec2_vs_host_os_image_dictionary: rhel-8-1: "*RHEL-8.1*_HVM*x86_64*" - rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" + # rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" # removed rhel-8-4: "*RHEL-8.4*_HVM*x86_64*" rhel-8-6: "*RHEL-8.6*_HVM*x86_64*" rhel-8-8: "*RHEL-8.8*_HVM*x86_64*" + rhel-8-10: "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0: "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1: "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2: "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3: "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4: "*RHEL-9.4*_HVM*x86_64*" + sles-12-5: "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" # removed + # sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" # removed + # sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" # removed + sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6: "*suse-sles-15-sp6-v202*-hvm-ssd-x86_64*" + # rhel-7-7-sap-ha: "*RHEL-SAP-8.1.0*" # removed + # rhel-7-9-sap-ha: "*RHEL-SAP-8.1.0*" # removed rhel-8-1-sap-ha: "*RHEL-SAP-8.1.0*" rhel-8-2-sap-ha: "*RHEL-SAP-8.2.0*" rhel-8-4-sap-ha: "*RHEL-SAP-8.4.0*" rhel-8-6-sap-ha: "*RHEL-SAP-8.6.0*" rhel-8-8-sap-ha: "*RHEL-SAP-8.8.0*" + rhel-8-10-sap-ha: "*RHEL-SAP-8.10.0*" rhel-9-0-sap-ha: "*RHEL-SAP-9.0.0*" rhel-9-2-sap-ha: "*RHEL-SAP-9.2.0*" - sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" - sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" - sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" - sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + rhel-9-4-sap-ha: "*RHEL-SAP-9.4.0*" sles-12-5-sap-ha: "*suse-sles-sap-12-sp5-v202*-hvm-ssd-x86_64*" sles-15-1-sap-ha: "*suse-sles-sap-15-sp1-v202*-hvm-ssd-x86_64*" sles-15-2-sap-ha: "*suse-sles-sap-15-sp2-v202*-hvm-ssd-x86_64*" sles-15-3-sap-ha: "*suse-sles-sap-15-sp3-v202*-hvm-ssd-x86_64*" sles-15-4-sap-ha: "*suse-sles-sap-15-sp4-v202*-hvm-ssd-x86_64*" sles-15-5-sap-ha: "*suse-sles-sap-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha: "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" + sles-15-4-sap-ha-byos: "*suse-sles-sap-15-sp4-byos-v202*-hvm-ssd-x86_64*" + sles-15-5-sap-ha-byos: "*suse-sles-sap-15-sp5-byos-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha-byos: "*suse-sles-sap-15-sp6-byos-v202*-hvm-ssd-x86_64*" sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: @@ -721,42 +737,75 @@ sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: #### sap_vm_provision_gcp_ce_vm_host_os_image_dictionary: - rhel-8-latest: project: "rhel-cloud" family: "rhel-8" - - rhel-8-1-sap-ha: + rhel-9-latest: + project: "rhel-cloud" + family: "rhel-9" + sles-12-latest: + project: "suse-cloud" + family: "sles-12" + sles-15-latest: + project: "suse-cloud" + family: "sles-15" + # rhel-7-7-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-7-7-sap-ha" + rhel-7-9-sap-ha: project: "rhel-sap-cloud" - family: "rhel-8-1-sap-ha" - + family: "rhel-7-9-sap-ha" + # rhel-8-1-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-8-1-sap-ha" rhel-8-2-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-2-sap-ha" - rhel-8-4-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-4-sap-ha" - rhel-8-6-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-6-sap-ha" - - sles-15-latest: - project: "suse-cloud" - family: "sles-15" - - sles-15-sp3-sap: + sles-12-5-sap-ha: + project: "suse-sap-cloud" + family: "sles-12-sp5-sap" + # sles-15-1-sap-ha: # removed + # project: "suse-sap-cloud" + # family: "sles-15-sp1-sap" + sles-15-2-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp2-sap" + sles-15-3-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp3-sap" - - sles-15-sp4-sap: + sles-15-4-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp4-sap" - - sles-15-sp5-sap: + sles-15-5-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp5-sap" + sles-15-6-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp6-sap" + sles-12-5-sap-ha-byos: + project: "suse-byos-cloud" + family: "sles-12-sp5-sap-byos" + sles-15-2-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp2-sap-byos" + sles-15-3-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp3-sap-byos" + sles-15-4-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp4-sap-byos" + sles-15-5-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp5-sap-byos" + sles-15-6-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp6-sap-byos" sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: @@ -1124,16 +1173,31 @@ sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: sap_vm_provision_ibmcloud_vs_host_os_image_dictionary: rhel-8-4: ".*redhat.*8-4.*minimal.*amd64.*" rhel-8-6: ".*redhat.*8-6.*minimal.*amd64.*" + rhel-8-8: ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10: ".*redhat.*8-10.*minimal.*amd64.*" rhel-9-0: ".*redhat.*9-0.*minimal.*amd64.*" rhel-9-2: ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4: ".*redhat.*9-4.*minimal.*amd64.*" + sles-15-5: ".*sles.*15-5.*amd64-[0-9]" + sles-15-6: ".*sles.*15-6.*amd64-[0-9]" + # rhel-7-6-sap-ha: ".*redhat.*7-6.*amd64.*hana.*" # retrievable from deprecated list + # rhel-7-9-sap-ha: ".*redhat.*7-9.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-1-sap-ha: ".*redhat.*8-1.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-2-sap-ha: ".*redhat.*8-2.*amd64.*hana.*" # retrievable from deprecated list rhel-8-4-sap-ha: ".*redhat.*8-4.*amd64.*hana.*" rhel-8-6-sap-ha: ".*redhat.*8-6.*amd64.*hana.*" rhel-8-8-sap-ha: ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha: ".*redhat.*8-10.*amd64.*hana.*" rhel-9-0-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" - rhel-9-2-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha: ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha: ".*redhat.*9-4.*amd64.*hana.*" + # sles-12-4-sap-ha: ".*sles.*12-4.*amd64.*hana.*" # retrievable from deprecated list + # sles-12-5-sap-ha: ".*sles.*12-5.*amd64.*hana.*" # retrievable from deprecated list + # sles-15-1-sap-ha: ".*sles.*15-1.*amd64.*hana.*" # retrievable from deprecated list sles-15-3-sap-ha: ".*sles.*15-3.*amd64.*hana.*" sles-15-4-sap-ha: ".*sles.*15-4.*amd64.*hana.*" sles-15-5-sap-ha: ".*sles.*15-5.*amd64.*hana.*" + sles-15-6-sap-ha: ".*sles.*15-6.*amd64.*hana.*" sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: @@ -1496,17 +1560,26 @@ sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: # Full Linux subscription ppc64le OS Images with support and activation keys sap_vm_provision_ibmcloud_powervs_host_os_image_dictionary: - rhel-8-4: ".*RHEL.*8.*4" - rhel-8-6: ".*RHEL.*8.*6" + rhel-8-8: ".*RHEL.*8.*8" rhel-9-2: ".*RHEL.*9.*2" - sles-15-3: ".*SLES.*15.*3" - sles-15-4: ".*SLES.*15.*4" + rhel-9-4: ".*RHEL.*9.*4" + sles-15-5: ".*SLES.*15.*5$" + rhel-8-4-sap-ha: "RHEL8-SP4-SAP" rhel-8-6-sap-ha: ".*RHEL.*8.*6.*SAP$" # ensure string suffix using $ rhel-8-8-sap-ha: ".*RHEL.*8.*8.*SAP$" # ensure string suffix using $ rhel-9-2-sap-ha: ".*RHEL.*9.*2.*SAP$" # ensure string suffix using $ sles-15-2-sap-ha: ".*SLES.*15.*2.*SAP$" # ensure string suffix using $ sles-15-3-sap-ha: ".*SLES.*15.*3.*SAP$" # ensure string suffix using $ sles-15-4-sap-ha: ".*SLES.*15.*4.*SAP$" # ensure string suffix using $ + sles-15-5-sap-ha: "SLES15-SP5-SAP" + # rhel-8-4-sap-ha-byol: "RHEL8-SP4-SAP-BYOL" + # rhel-8-6-sap-ha-byol: ".*RHEL.*8.*6.*SAP-BYOL$" # ensure string suffix using $ + # rhel-8-8-sap-ha-byol: ".*RHEL.*8.*8.*SAP-BYOL$" # ensure string suffix using $ + # rhel-9-2-sap-ha-byol: ".*RHEL.*9.*2.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-2-sap-ha-byol: ".*SLES.*15.*2.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-3-sap-ha-byol: ".*SLES.*15.*3.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-4-sap-ha-byol: ".*SLES.*15.*4.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-5-sap-ha-byol: "SLES15-SP5-SAP-BYOL" sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: @@ -1573,7 +1646,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: - name: swap # hdb swap_path: /swapfile # use swap file on root disk, instead of creating LVM LV for swap disk_size: 2 - disk_type: tier3 + disk_type: tier1 filesystem_type: swap # must be swap filesystem - name: software @@ -1679,7 +1752,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: - name: swap # hdb swap_path: /swapfile # use swap file on root disk, instead of creating LVM LV for swap disk_size: 2 - disk_type: tier3 + disk_type: tier1 filesystem_type: swap # must be swap filesystem - name: software @@ -1785,7 +1858,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: - name: swap # hdb swap_path: /swapfile # use swap file on root disk, instead of creating LVM LV for swap disk_size: 2 - disk_type: tier3 + disk_type: tier1 filesystem_type: swap # must be swap filesystem - name: software @@ -1850,96 +1923,186 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: #### sap_vm_provision_msazure_vm_host_os_image_dictionary: - + rhel-8-0: + publisher: "RedHat" + offer: "RHEL" + sku: "8-gen2" + rhel-8-1: + publisher: "RedHat" + offer: "RHEL" + sku: "81-gen2" + rhel-8-2: + publisher: "RedHat" + offer: "RHEL" + sku: "82-gen2" + rhel-8-3: + publisher: "RedHat" + offer: "RHEL" + sku: "83-gen2" rhel-8-4: publisher: "RedHat" offer: "RHEL" sku: "84-gen2" - + rhel-8-5: + publisher: "RedHat" + offer: "RHEL" + sku: "85-gen2" + rhel-8-6: + publisher: "RedHat" + offer: "RHEL" + sku: "86-gen2" + rhel-8-7: + publisher: "RedHat" + offer: "RHEL" + sku: "87-gen2" + rhel-8-8: + publisher: "RedHat" + offer: "RHEL" + sku: "88-gen2" + rhel-8-9: + publisher: "RedHat" + offer: "RHEL" + sku: "89-gen2" + rhel-8-10: + publisher: "RedHat" + offer: "RHEL" + sku: "810-gen2" + rhel-9-0: + publisher: "RedHat" + offer: "RHEL" + sku: "90-gen2" + rhel-9-1: + publisher: "RedHat" + offer: "RHEL" + sku: "91-gen2" + rhel-9-2: + publisher: "RedHat" + offer: "RHEL" + sku: "92-gen2" + rhel-9-3: + publisher: "RedHat" + offer: "RHEL" + sku: "93-gen2" + rhel-9-4: + publisher: "RedHat" + offer: "RHEL" + sku: "94-gen2" + sles-12-5: + publisher: "SUSE" + offer: "sles-12-sp5" + sku: "gen2" + sles-15-1: + publisher: "SUSE" + offer: "sles-15-sp1" + sku: "gen2" + sles-15-2: + publisher: "SUSE" + offer: "sles-15-sp2" + sku: "gen2" + sles-15-3: + publisher: "SUSE" + offer: "sles-15-sp3" + sku: "gen2" + sles-15-4: + publisher: "SUSE" + offer: "sles-15-sp4" + sku: "gen2" + sles-15-5: + publisher: "SUSE" + offer: "sles-15-sp5" + sku: "gen2" + sles-15-6: + publisher: "SUSE" + offer: "sles-15-sp6" + sku: "gen2" rhel-8-1-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "81sapha-gen2" - rhel-8-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "82sapha-gen2" - rhel-8-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "84sapha-gen2" - rhel-8-6-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "86sapha-gen2" - rhel-8-8-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "88sapha-gen2" - + rhel-8-10-sap-ha: + publisher: "RedHat" + offer: "RHEL-SAP-HA" + sku: "810sapha-gen2" rhel-9-0-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "90sapha-gen2" - rhel-9-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "92sapha-gen2" - - rhel-8-1-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "81sapapps-gen2" - - rhel-8-2-sap-applications: + rhel-9-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" - sku: "82sapapps-gen2" - - rhel-8-4-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "84sapapps-gen2" - - rhel-8-6-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "86sapapps-gen2" - - rhel-8-8-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "88sapapps-gen2" - - rhel-9-0-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "90sapapps-gen2" - - rhel-9-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "92sapapps-gen2" - - sles-15-sp3-sap: + sku: "94sapha-gen2" + sles-12-5-sap-ha: + publisher: "SUSE" + offer: "sles-sap-12-sp5" + sku: "gen2" + sles-15-1-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp1" + sku: "gen2" + sles-15-2-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp2" + sku: "gen2" + sles-15-3-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp3" sku: "gen2" - - sles-15-sp4-sap: + sles-15-4-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp4" sku: "gen2" - - sles-15-sp5-sap: + sles-15-5-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp5" sku: "gen2" + sles-15-6-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp6" + sku: "gen2" + sles-15-1-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp1-byos" + sku: "gen2" + sles-15-2-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp2-byos" + sku: "gen2" + sles-15-3-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp3-byos" + sku: "gen2" + sles-15-4-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp4-byos" + sku: "gen2" + sles-15-5-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp5-byos" + sku: "gen2" + sles-15-6-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp6-byos" + sku: "gen2" sap_vm_provision_msazure_vm_host_specifications_dictionary: @@ -2695,7 +2858,7 @@ sap_vm_provision_ovirt_vm_host_specifications_dictionary: - name: swap # hdb swap_path: /swapfile # use swap file on root disk, instead of creating LVM LV for swap disk_size: 2 - disk_type: tier3 + disk_type: tier1 filesystem_type: swap # must be swap filesystem - name: software @@ -2803,7 +2966,7 @@ sap_vm_provision_ovirt_vm_host_specifications_dictionary: - name: swap # hdb swap_path: /swapfile # use swap file on root disk, instead of creating LVM LV for swap disk_size: 2 - disk_type: tier3 + disk_type: tier1 filesystem_type: swap # must be swap filesystem - name: software @@ -2911,7 +3074,7 @@ sap_vm_provision_ovirt_vm_host_specifications_dictionary: - name: swap # hdb swap_path: /swapfile # use swap file on root disk, instead of creating LVM LV for swap disk_size: 2 - disk_type: tier3 + disk_type: tier1 filesystem_type: swap # must be swap filesystem - name: software @@ -3151,7 +3314,7 @@ sap_vm_provision_vmware_vm_host_specifications_dictionary: - name: swap # hdb swap_path: /swapfile # use swap file on root disk, instead of creating LVM LV for swap disk_size: 2 - disk_type: tier3 + disk_type: tier1 filesystem_type: swap # must be swap filesystem - name: software @@ -3261,7 +3424,7 @@ sap_vm_provision_vmware_vm_host_specifications_dictionary: - name: swap # hdb swap_path: /swapfile # use swap file on root disk, instead of creating LVM LV for swap disk_size: 2 - disk_type: tier3 + disk_type: tier1 filesystem_type: swap # must be swap filesystem - name: software diff --git a/deploy_scenarios/sap_landscape_s4hana_standard_maintplan/ansible_requirements.yml b/deploy_scenarios/sap_landscape_s4hana_standard_maintplan/ansible_requirements.yml index af7ed22..1454ec5 100644 --- a/deploy_scenarios/sap_landscape_s4hana_standard_maintplan/ansible_requirements.yml +++ b/deploy_scenarios/sap_landscape_s4hana_standard_maintplan/ansible_requirements.yml @@ -8,16 +8,16 @@ collections: version: 6.1.0 - name: fedora.linux_system_roles type: galaxy - version: 1.82.0 + version: 1.88.9 - name: community.sap_install type: galaxy - version: 1.4.0 + version: 1.5.0 - name: community.sap_launchpad type: galaxy - version: 1.1.0 + version: 1.1.1 - name: community.sap_infrastructure type: galaxy - version: 1.0.1 + version: 1.1.0 # - name: community.sap_operations # type: galaxy # version: 0.9.1 @@ -25,23 +25,23 @@ collections: # Collections for Infrastructure from Ansible Galaxy - name: cloud.terraform type: galaxy - version: 1.1.0 + version: 3.0.0 - name: amazon.aws type: galaxy - version: 7.2.0 + version: 9.0.0 - name: community.aws type: galaxy - version: 7.1.0 + version: 9.0.0 - name: azure.azcollection type: galaxy - version: 2.2.0 + version: 3.0.1 - name: google.cloud type: galaxy version: 1.1.3 # Replace with ibm.cloud in future, legacy Ansible Collection uses hidden on-the-fly Terraform files in /var/tmp/ansible/ibmcloud) - name: ibm.cloudcollection type: galaxy - version: 1.51.0 + version: 1.71.2 - name: ovirt.ovirt type: galaxy version: 3.1.2 @@ -53,21 +53,12 @@ collections: version: 3.0.0 - name: cloud.common type: galaxy - version: 3.0.0 + version: 4.0.0 # Collections from public repositories via HTTPS # - name: https://github.com/sap-linuxlab/community.sap_install.git # type: git # version: dev -# - name: https://github.com/sap-linuxlab/community.sap_launchpad.git -# type: git -# version: main -# - name: https://github.com/sap-linuxlab/community.sap_operations.git -# type: git -# version: main -# - name: https://github.com/ansible-collections/cloud.terraform.git -# type: git -# version: main # Collections from private repositories via use SSH (embedded GitHub PAT does not work) # Used for customised/forked Ansible Collections diff --git a/deploy_scenarios/sap_landscape_s4hana_standard_maintplan/optional/ansible_extravars_noninteractive.yml b/deploy_scenarios/sap_landscape_s4hana_standard_maintplan/optional/ansible_extravars_noninteractive.yml index c55f00a..b06f557 100755 --- a/deploy_scenarios/sap_landscape_s4hana_standard_maintplan/optional/ansible_extravars_noninteractive.yml +++ b/deploy_scenarios/sap_landscape_s4hana_standard_maintplan/optional/ansible_extravars_noninteractive.yml @@ -102,13 +102,14 @@ sap_vm_provision_ibmcloud_vpc_sg_names: "ENTER_STRING_VALUE_HERE,ENTER_STRING_VA #### sap_vm_provision_ibmcloud_api_key: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ibmcloud_resource_group_name: "ENTER_STRING_VALUE_HERE" # if ansible_to_terraform, use "new" -sap_vm_provision_ibmcloud_private_dns_instance_name: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_private_dns_instance_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform sap_vm_provision_ibmcloud_powervs_location: "ENTER_STRING_VALUE_HERE" -sap_vm_provision_ibmcloud_powervs_workspace_name: "ENTER_STRING_VALUE_HERE" -sap_vm_provision_ibmcloud_powervs_vlan_subnet_name: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_powervs_workspace_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform +sap_vm_provision_ibmcloud_powervs_vlan_subnet_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform sap_vm_provision_ibmcloud_powervs_host_os_image: "ENTER_STRING_VALUE_HERE" sap_vm_provision_bastion_user: "ENTER_STRING_VALUE_HERE" sap_vm_provision_bastion_ssh_port: "ENTER_STRING_VALUE_HERE" +# sap_vm_provision_ibmcloud_vpc_subnet_name: "ENTER_STRING_VALUE_HERE" # only for ansible_to_terraform, can be name or 'new' # Only for use when 'ansible' is value provided for variable sap_vm_provision_iac_type #### @@ -116,6 +117,7 @@ sap_vm_provision_bastion_public_ip: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ssh_bastion_private_key_file_path: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ssh_host_private_key_file_path: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ibmcloud_powervs_key_pair_name_ssh_host_public_key: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_private_dns_custom_resolver_ip: "ENTER_STRING_VALUE_HERE" # sap_vm_provision_ibmcloud_private_dns_resource_group_name: "" # optional, default use of sap_vm_provision_ibmcloud_resource_group_name sap_vm_provision_proxy_web_forward_proxy_ip: "ENTER_STRING_VALUE_HERE" # IP:Port only, no http:// prefix sap_vm_provision_proxy_web_forward_exclusions: "localhost,127.0.0.1,{{ sap_vm_provision_dns_root_domain }}" @@ -320,7 +322,7 @@ sap_id_user_password: 'ENTER_STRING_VALUE_HERE' sap_maintenance_planner_transaction_name: 'ENTER_STRING_VALUE_HERE' # Directory for SAP installation media -sap_software_download_directory: "ENTER_STRING_VALUE_HERE" +sap_install_media_detect_source_directory: "ENTER_STRING_VALUE_HERE" # e.g. /software #### diff --git a/deploy_scenarios/sap_nwas_abap_hana_sandbox/ansible_extravars.yml b/deploy_scenarios/sap_nwas_abap_hana_sandbox/ansible_extravars.yml index 45d3b14..89dc911 100755 --- a/deploy_scenarios/sap_nwas_abap_hana_sandbox/ansible_extravars.yml +++ b/deploy_scenarios/sap_nwas_abap_hana_sandbox/ansible_extravars.yml @@ -280,27 +280,43 @@ sap_swpm_templates_install_dictionary: sap_vm_provision_aws_ec2_vs_host_os_image_dictionary: rhel-8-1: "*RHEL-8.1*_HVM*x86_64*" - rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" + # rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" # removed rhel-8-4: "*RHEL-8.4*_HVM*x86_64*" rhel-8-6: "*RHEL-8.6*_HVM*x86_64*" rhel-8-8: "*RHEL-8.8*_HVM*x86_64*" + rhel-8-10: "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0: "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1: "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2: "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3: "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4: "*RHEL-9.4*_HVM*x86_64*" + sles-12-5: "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" # removed + # sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" # removed + # sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" # removed + sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6: "*suse-sles-15-sp6-v202*-hvm-ssd-x86_64*" + # rhel-7-7-sap-ha: "*RHEL-SAP-8.1.0*" # removed + # rhel-7-9-sap-ha: "*RHEL-SAP-8.1.0*" # removed rhel-8-1-sap-ha: "*RHEL-SAP-8.1.0*" rhel-8-2-sap-ha: "*RHEL-SAP-8.2.0*" rhel-8-4-sap-ha: "*RHEL-SAP-8.4.0*" rhel-8-6-sap-ha: "*RHEL-SAP-8.6.0*" rhel-8-8-sap-ha: "*RHEL-SAP-8.8.0*" + rhel-8-10-sap-ha: "*RHEL-SAP-8.10.0*" rhel-9-0-sap-ha: "*RHEL-SAP-9.0.0*" rhel-9-2-sap-ha: "*RHEL-SAP-9.2.0*" - sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" - sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" - sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" - sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + rhel-9-4-sap-ha: "*RHEL-SAP-9.4.0*" sles-12-5-sap-ha: "*suse-sles-sap-12-sp5-v202*-hvm-ssd-x86_64*" sles-15-1-sap-ha: "*suse-sles-sap-15-sp1-v202*-hvm-ssd-x86_64*" sles-15-2-sap-ha: "*suse-sles-sap-15-sp2-v202*-hvm-ssd-x86_64*" sles-15-3-sap-ha: "*suse-sles-sap-15-sp3-v202*-hvm-ssd-x86_64*" sles-15-4-sap-ha: "*suse-sles-sap-15-sp4-v202*-hvm-ssd-x86_64*" sles-15-5-sap-ha: "*suse-sles-sap-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha: "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" + sles-15-4-sap-ha-byos: "*suse-sles-sap-15-sp4-byos-v202*-hvm-ssd-x86_64*" + sles-15-5-sap-ha-byos: "*suse-sles-sap-15-sp5-byos-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha-byos: "*suse-sles-sap-15-sp6-byos-v202*-hvm-ssd-x86_64*" sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: @@ -380,42 +396,75 @@ sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: #### sap_vm_provision_gcp_ce_vm_host_os_image_dictionary: - rhel-8-latest: project: "rhel-cloud" family: "rhel-8" - - rhel-8-1-sap-ha: + rhel-9-latest: + project: "rhel-cloud" + family: "rhel-9" + sles-12-latest: + project: "suse-cloud" + family: "sles-12" + sles-15-latest: + project: "suse-cloud" + family: "sles-15" + # rhel-7-7-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-7-7-sap-ha" + rhel-7-9-sap-ha: project: "rhel-sap-cloud" - family: "rhel-8-1-sap-ha" - + family: "rhel-7-9-sap-ha" + # rhel-8-1-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-8-1-sap-ha" rhel-8-2-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-2-sap-ha" - rhel-8-4-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-4-sap-ha" - rhel-8-6-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-6-sap-ha" - - sles-15-latest: - project: "suse-cloud" - family: "sles-15" - - sles-15-sp3-sap: + sles-12-5-sap-ha: + project: "suse-sap-cloud" + family: "sles-12-sp5-sap" + # sles-15-1-sap-ha: # removed + # project: "suse-sap-cloud" + # family: "sles-15-sp1-sap" + sles-15-2-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp2-sap" + sles-15-3-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp3-sap" - - sles-15-sp4-sap: + sles-15-4-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp4-sap" - - sles-15-sp5-sap: + sles-15-5-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp5-sap" + sles-15-6-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp6-sap" + sles-12-5-sap-ha-byos: + project: "suse-byos-cloud" + family: "sles-12-sp5-sap-byos" + sles-15-2-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp2-sap-byos" + sles-15-3-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp3-sap-byos" + sles-15-4-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp4-sap-byos" + sles-15-5-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp5-sap-byos" + sles-15-6-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp6-sap-byos" sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: @@ -505,16 +554,31 @@ sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: sap_vm_provision_ibmcloud_vs_host_os_image_dictionary: rhel-8-4: ".*redhat.*8-4.*minimal.*amd64.*" rhel-8-6: ".*redhat.*8-6.*minimal.*amd64.*" + rhel-8-8: ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10: ".*redhat.*8-10.*minimal.*amd64.*" rhel-9-0: ".*redhat.*9-0.*minimal.*amd64.*" rhel-9-2: ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4: ".*redhat.*9-4.*minimal.*amd64.*" + sles-15-5: ".*sles.*15-5.*amd64-[0-9]" + sles-15-6: ".*sles.*15-6.*amd64-[0-9]" + # rhel-7-6-sap-ha: ".*redhat.*7-6.*amd64.*hana.*" # retrievable from deprecated list + # rhel-7-9-sap-ha: ".*redhat.*7-9.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-1-sap-ha: ".*redhat.*8-1.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-2-sap-ha: ".*redhat.*8-2.*amd64.*hana.*" # retrievable from deprecated list rhel-8-4-sap-ha: ".*redhat.*8-4.*amd64.*hana.*" rhel-8-6-sap-ha: ".*redhat.*8-6.*amd64.*hana.*" rhel-8-8-sap-ha: ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha: ".*redhat.*8-10.*amd64.*hana.*" rhel-9-0-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" - rhel-9-2-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha: ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha: ".*redhat.*9-4.*amd64.*hana.*" + # sles-12-4-sap-ha: ".*sles.*12-4.*amd64.*hana.*" # retrievable from deprecated list + # sles-12-5-sap-ha: ".*sles.*12-5.*amd64.*hana.*" # retrievable from deprecated list + # sles-15-1-sap-ha: ".*sles.*15-1.*amd64.*hana.*" # retrievable from deprecated list sles-15-3-sap-ha: ".*sles.*15-3.*amd64.*hana.*" sles-15-4-sap-ha: ".*sles.*15-4.*amd64.*hana.*" sles-15-5-sap-ha: ".*sles.*15-5.*amd64.*hana.*" + sles-15-6-sap-ha: ".*sles.*15-6.*amd64.*hana.*" sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: @@ -603,17 +667,26 @@ sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: # Full Linux subscription ppc64le OS Images with support and activation keys sap_vm_provision_ibmcloud_powervs_host_os_image_dictionary: - rhel-8-4: ".*RHEL.*8.*4" - rhel-8-6: ".*RHEL.*8.*6" + rhel-8-8: ".*RHEL.*8.*8" rhel-9-2: ".*RHEL.*9.*2" - sles-15-3: ".*SLES.*15.*3" - sles-15-4: ".*SLES.*15.*4" + rhel-9-4: ".*RHEL.*9.*4" + sles-15-5: ".*SLES.*15.*5$" + rhel-8-4-sap-ha: "RHEL8-SP4-SAP" rhel-8-6-sap-ha: ".*RHEL.*8.*6.*SAP$" # ensure string suffix using $ rhel-8-8-sap-ha: ".*RHEL.*8.*8.*SAP$" # ensure string suffix using $ rhel-9-2-sap-ha: ".*RHEL.*9.*2.*SAP$" # ensure string suffix using $ sles-15-2-sap-ha: ".*SLES.*15.*2.*SAP$" # ensure string suffix using $ sles-15-3-sap-ha: ".*SLES.*15.*3.*SAP$" # ensure string suffix using $ sles-15-4-sap-ha: ".*SLES.*15.*4.*SAP$" # ensure string suffix using $ + sles-15-5-sap-ha: "SLES15-SP5-SAP" + # rhel-8-4-sap-ha-byol: "RHEL8-SP4-SAP-BYOL" + # rhel-8-6-sap-ha-byol: ".*RHEL.*8.*6.*SAP-BYOL$" # ensure string suffix using $ + # rhel-8-8-sap-ha-byol: ".*RHEL.*8.*8.*SAP-BYOL$" # ensure string suffix using $ + # rhel-9-2-sap-ha-byol: ".*RHEL.*9.*2.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-2-sap-ha-byol: ".*SLES.*15.*2.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-3-sap-ha-byol: ".*SLES.*15.*3.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-4-sap-ha-byol: ".*SLES.*15.*4.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-5-sap-ha-byol: "SLES15-SP5-SAP-BYOL" sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: @@ -673,7 +746,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: # See SAP Note 1597355 - Swap-space recommendation for Linux - name: swap # sbx disk_size: 96 - disk_type: tier3 + disk_type: tier1 filesystem_type: swap # must be swap filesystem - name: software @@ -689,96 +762,186 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: #### sap_vm_provision_msazure_vm_host_os_image_dictionary: - + rhel-8-0: + publisher: "RedHat" + offer: "RHEL" + sku: "8-gen2" + rhel-8-1: + publisher: "RedHat" + offer: "RHEL" + sku: "81-gen2" + rhel-8-2: + publisher: "RedHat" + offer: "RHEL" + sku: "82-gen2" + rhel-8-3: + publisher: "RedHat" + offer: "RHEL" + sku: "83-gen2" rhel-8-4: publisher: "RedHat" offer: "RHEL" sku: "84-gen2" - + rhel-8-5: + publisher: "RedHat" + offer: "RHEL" + sku: "85-gen2" + rhel-8-6: + publisher: "RedHat" + offer: "RHEL" + sku: "86-gen2" + rhel-8-7: + publisher: "RedHat" + offer: "RHEL" + sku: "87-gen2" + rhel-8-8: + publisher: "RedHat" + offer: "RHEL" + sku: "88-gen2" + rhel-8-9: + publisher: "RedHat" + offer: "RHEL" + sku: "89-gen2" + rhel-8-10: + publisher: "RedHat" + offer: "RHEL" + sku: "810-gen2" + rhel-9-0: + publisher: "RedHat" + offer: "RHEL" + sku: "90-gen2" + rhel-9-1: + publisher: "RedHat" + offer: "RHEL" + sku: "91-gen2" + rhel-9-2: + publisher: "RedHat" + offer: "RHEL" + sku: "92-gen2" + rhel-9-3: + publisher: "RedHat" + offer: "RHEL" + sku: "93-gen2" + rhel-9-4: + publisher: "RedHat" + offer: "RHEL" + sku: "94-gen2" + sles-12-5: + publisher: "SUSE" + offer: "sles-12-sp5" + sku: "gen2" + sles-15-1: + publisher: "SUSE" + offer: "sles-15-sp1" + sku: "gen2" + sles-15-2: + publisher: "SUSE" + offer: "sles-15-sp2" + sku: "gen2" + sles-15-3: + publisher: "SUSE" + offer: "sles-15-sp3" + sku: "gen2" + sles-15-4: + publisher: "SUSE" + offer: "sles-15-sp4" + sku: "gen2" + sles-15-5: + publisher: "SUSE" + offer: "sles-15-sp5" + sku: "gen2" + sles-15-6: + publisher: "SUSE" + offer: "sles-15-sp6" + sku: "gen2" rhel-8-1-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "81sapha-gen2" - rhel-8-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "82sapha-gen2" - rhel-8-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "84sapha-gen2" - rhel-8-6-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "86sapha-gen2" - rhel-8-8-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "88sapha-gen2" - + rhel-8-10-sap-ha: + publisher: "RedHat" + offer: "RHEL-SAP-HA" + sku: "810sapha-gen2" rhel-9-0-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "90sapha-gen2" - rhel-9-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "92sapha-gen2" - - rhel-8-1-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "81sapapps-gen2" - - rhel-8-2-sap-applications: + rhel-9-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" - sku: "82sapapps-gen2" - - rhel-8-4-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "84sapapps-gen2" - - rhel-8-6-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "86sapapps-gen2" - - rhel-8-8-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "88sapapps-gen2" - - rhel-9-0-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "90sapapps-gen2" - - rhel-9-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "92sapapps-gen2" - - sles-15-sp3-sap: + sku: "94sapha-gen2" + sles-12-5-sap-ha: + publisher: "SUSE" + offer: "sles-sap-12-sp5" + sku: "gen2" + sles-15-1-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp1" + sku: "gen2" + sles-15-2-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp2" + sku: "gen2" + sles-15-3-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp3" sku: "gen2" - - sles-15-sp4-sap: + sles-15-4-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp4" sku: "gen2" - - sles-15-sp5-sap: + sles-15-5-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp5" sku: "gen2" + sles-15-6-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp6" + sku: "gen2" + sles-15-1-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp1-byos" + sku: "gen2" + sles-15-2-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp2-byos" + sku: "gen2" + sles-15-3-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp3-byos" + sku: "gen2" + sles-15-4-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp4-byos" + sku: "gen2" + sles-15-5-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp5-byos" + sku: "gen2" + sles-15-6-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp6-byos" + sku: "gen2" sap_vm_provision_msazure_vm_host_specifications_dictionary: diff --git a/deploy_scenarios/sap_nwas_abap_hana_sandbox/ansible_playbook.yml b/deploy_scenarios/sap_nwas_abap_hana_sandbox/ansible_playbook.yml index a3dc406..0b30223 100644 --- a/deploy_scenarios/sap_nwas_abap_hana_sandbox/ansible_playbook.yml +++ b/deploy_scenarios/sap_nwas_abap_hana_sandbox/ansible_playbook.yml @@ -129,7 +129,6 @@ mode: '0755' loop: - "{{ sap_install_media_detect_source_directory }}" - - "{{ sap_hana_install_software_directory }}" - name: Install Python package manager pip3 to system Python ansible.builtin.package: diff --git a/deploy_scenarios/sap_nwas_abap_hana_sandbox/ansible_requirements.yml b/deploy_scenarios/sap_nwas_abap_hana_sandbox/ansible_requirements.yml index af7ed22..1454ec5 100644 --- a/deploy_scenarios/sap_nwas_abap_hana_sandbox/ansible_requirements.yml +++ b/deploy_scenarios/sap_nwas_abap_hana_sandbox/ansible_requirements.yml @@ -8,16 +8,16 @@ collections: version: 6.1.0 - name: fedora.linux_system_roles type: galaxy - version: 1.82.0 + version: 1.88.9 - name: community.sap_install type: galaxy - version: 1.4.0 + version: 1.5.0 - name: community.sap_launchpad type: galaxy - version: 1.1.0 + version: 1.1.1 - name: community.sap_infrastructure type: galaxy - version: 1.0.1 + version: 1.1.0 # - name: community.sap_operations # type: galaxy # version: 0.9.1 @@ -25,23 +25,23 @@ collections: # Collections for Infrastructure from Ansible Galaxy - name: cloud.terraform type: galaxy - version: 1.1.0 + version: 3.0.0 - name: amazon.aws type: galaxy - version: 7.2.0 + version: 9.0.0 - name: community.aws type: galaxy - version: 7.1.0 + version: 9.0.0 - name: azure.azcollection type: galaxy - version: 2.2.0 + version: 3.0.1 - name: google.cloud type: galaxy version: 1.1.3 # Replace with ibm.cloud in future, legacy Ansible Collection uses hidden on-the-fly Terraform files in /var/tmp/ansible/ibmcloud) - name: ibm.cloudcollection type: galaxy - version: 1.51.0 + version: 1.71.2 - name: ovirt.ovirt type: galaxy version: 3.1.2 @@ -53,21 +53,12 @@ collections: version: 3.0.0 - name: cloud.common type: galaxy - version: 3.0.0 + version: 4.0.0 # Collections from public repositories via HTTPS # - name: https://github.com/sap-linuxlab/community.sap_install.git # type: git # version: dev -# - name: https://github.com/sap-linuxlab/community.sap_launchpad.git -# type: git -# version: main -# - name: https://github.com/sap-linuxlab/community.sap_operations.git -# type: git -# version: main -# - name: https://github.com/ansible-collections/cloud.terraform.git -# type: git -# version: main # Collections from private repositories via use SSH (embedded GitHub PAT does not work) # Used for customised/forked Ansible Collections diff --git a/deploy_scenarios/sap_nwas_abap_hana_sandbox/optional/ansible_extravars_noninteractive.yml b/deploy_scenarios/sap_nwas_abap_hana_sandbox/optional/ansible_extravars_noninteractive.yml index e8d0893..2ac76bd 100755 --- a/deploy_scenarios/sap_nwas_abap_hana_sandbox/optional/ansible_extravars_noninteractive.yml +++ b/deploy_scenarios/sap_nwas_abap_hana_sandbox/optional/ansible_extravars_noninteractive.yml @@ -113,13 +113,14 @@ sap_vm_provision_ibmcloud_vpc_sg_names: "ENTER_STRING_VALUE_HERE,ENTER_STRING_VA #### sap_vm_provision_ibmcloud_api_key: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ibmcloud_resource_group_name: "ENTER_STRING_VALUE_HERE" # if ansible_to_terraform, use "new" -sap_vm_provision_ibmcloud_private_dns_instance_name: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_private_dns_instance_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform sap_vm_provision_ibmcloud_powervs_location: "ENTER_STRING_VALUE_HERE" -sap_vm_provision_ibmcloud_powervs_workspace_name: "ENTER_STRING_VALUE_HERE" -sap_vm_provision_ibmcloud_powervs_vlan_subnet_name: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_powervs_workspace_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform +sap_vm_provision_ibmcloud_powervs_vlan_subnet_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform sap_vm_provision_ibmcloud_powervs_host_os_image: "ENTER_STRING_VALUE_HERE" sap_vm_provision_bastion_user: "ENTER_STRING_VALUE_HERE" sap_vm_provision_bastion_ssh_port: "ENTER_STRING_VALUE_HERE" +# sap_vm_provision_ibmcloud_vpc_subnet_name: "ENTER_STRING_VALUE_HERE" # only for ansible_to_terraform, can be name or 'new' # Only for use when 'ansible' is value provided for variable sap_vm_provision_iac_type #### @@ -127,6 +128,7 @@ sap_vm_provision_bastion_public_ip: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ssh_bastion_private_key_file_path: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ssh_host_private_key_file_path: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ibmcloud_powervs_key_pair_name_ssh_host_public_key: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_private_dns_custom_resolver_ip: "ENTER_STRING_VALUE_HERE" # sap_vm_provision_ibmcloud_private_dns_resource_group_name: "" # optional, default use of sap_vm_provision_ibmcloud_resource_group_name sap_vm_provision_proxy_web_forward_proxy_ip: "ENTER_STRING_VALUE_HERE" # IP:Port only, no http:// prefix sap_vm_provision_proxy_web_forward_exclusions: "localhost,127.0.0.1,{{ sap_vm_provision_dns_root_domain }}" @@ -328,7 +330,7 @@ sap_id_user: "ENTER_STRING_VALUE_HERE" sap_id_user_password: 'ENTER_STRING_VALUE_HERE' # Directory for SAP installation media -sap_software_download_directory: "ENTER_STRING_VALUE_HERE" +sap_install_media_detect_source_directory: "ENTER_STRING_VALUE_HERE" # e.g. /software #### diff --git a/deploy_scenarios/sap_nwas_abap_ibmdb2_sandbox/ansible_extravars.yml b/deploy_scenarios/sap_nwas_abap_ibmdb2_sandbox/ansible_extravars.yml index 8f092cb..ce4460c 100755 --- a/deploy_scenarios/sap_nwas_abap_ibmdb2_sandbox/ansible_extravars.yml +++ b/deploy_scenarios/sap_nwas_abap_ibmdb2_sandbox/ansible_extravars.yml @@ -207,27 +207,43 @@ sap_swpm_templates_install_dictionary: sap_vm_provision_aws_ec2_vs_host_os_image_dictionary: rhel-8-1: "*RHEL-8.1*_HVM*x86_64*" - rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" + # rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" # removed rhel-8-4: "*RHEL-8.4*_HVM*x86_64*" rhel-8-6: "*RHEL-8.6*_HVM*x86_64*" rhel-8-8: "*RHEL-8.8*_HVM*x86_64*" + rhel-8-10: "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0: "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1: "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2: "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3: "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4: "*RHEL-9.4*_HVM*x86_64*" + sles-12-5: "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" # removed + # sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" # removed + # sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" # removed + sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6: "*suse-sles-15-sp6-v202*-hvm-ssd-x86_64*" + # rhel-7-7-sap-ha: "*RHEL-SAP-8.1.0*" # removed + # rhel-7-9-sap-ha: "*RHEL-SAP-8.1.0*" # removed rhel-8-1-sap-ha: "*RHEL-SAP-8.1.0*" rhel-8-2-sap-ha: "*RHEL-SAP-8.2.0*" rhel-8-4-sap-ha: "*RHEL-SAP-8.4.0*" rhel-8-6-sap-ha: "*RHEL-SAP-8.6.0*" rhel-8-8-sap-ha: "*RHEL-SAP-8.8.0*" + rhel-8-10-sap-ha: "*RHEL-SAP-8.10.0*" rhel-9-0-sap-ha: "*RHEL-SAP-9.0.0*" rhel-9-2-sap-ha: "*RHEL-SAP-9.2.0*" - sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" - sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" - sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" - sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + rhel-9-4-sap-ha: "*RHEL-SAP-9.4.0*" sles-12-5-sap-ha: "*suse-sles-sap-12-sp5-v202*-hvm-ssd-x86_64*" sles-15-1-sap-ha: "*suse-sles-sap-15-sp1-v202*-hvm-ssd-x86_64*" sles-15-2-sap-ha: "*suse-sles-sap-15-sp2-v202*-hvm-ssd-x86_64*" sles-15-3-sap-ha: "*suse-sles-sap-15-sp3-v202*-hvm-ssd-x86_64*" sles-15-4-sap-ha: "*suse-sles-sap-15-sp4-v202*-hvm-ssd-x86_64*" sles-15-5-sap-ha: "*suse-sles-sap-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha: "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" + sles-15-4-sap-ha-byos: "*suse-sles-sap-15-sp4-byos-v202*-hvm-ssd-x86_64*" + sles-15-5-sap-ha-byos: "*suse-sles-sap-15-sp5-byos-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha-byos: "*suse-sles-sap-15-sp6-byos-v202*-hvm-ssd-x86_64*" sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: @@ -295,42 +311,75 @@ sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: #### sap_vm_provision_gcp_ce_vm_host_os_image_dictionary: - rhel-8-latest: project: "rhel-cloud" family: "rhel-8" - - rhel-8-1-sap-ha: + rhel-9-latest: + project: "rhel-cloud" + family: "rhel-9" + sles-12-latest: + project: "suse-cloud" + family: "sles-12" + sles-15-latest: + project: "suse-cloud" + family: "sles-15" + # rhel-7-7-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-7-7-sap-ha" + rhel-7-9-sap-ha: project: "rhel-sap-cloud" - family: "rhel-8-1-sap-ha" - + family: "rhel-7-9-sap-ha" + # rhel-8-1-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-8-1-sap-ha" rhel-8-2-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-2-sap-ha" - rhel-8-4-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-4-sap-ha" - rhel-8-6-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-6-sap-ha" - - sles-15-latest: - project: "suse-cloud" - family: "sles-15" - - sles-15-sp3-sap: + sles-12-5-sap-ha: + project: "suse-sap-cloud" + family: "sles-12-sp5-sap" + # sles-15-1-sap-ha: # removed + # project: "suse-sap-cloud" + # family: "sles-15-sp1-sap" + sles-15-2-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp2-sap" + sles-15-3-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp3-sap" - - sles-15-sp4-sap: + sles-15-4-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp4-sap" - - sles-15-sp5-sap: + sles-15-5-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp5-sap" + sles-15-6-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp6-sap" + sles-12-5-sap-ha-byos: + project: "suse-byos-cloud" + family: "sles-12-sp5-sap-byos" + sles-15-2-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp2-sap-byos" + sles-15-3-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp3-sap-byos" + sles-15-4-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp4-sap-byos" + sles-15-5-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp5-sap-byos" + sles-15-6-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp6-sap-byos" sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: @@ -405,16 +454,31 @@ sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: sap_vm_provision_ibmcloud_vs_host_os_image_dictionary: rhel-8-4: ".*redhat.*8-4.*minimal.*amd64.*" rhel-8-6: ".*redhat.*8-6.*minimal.*amd64.*" + rhel-8-8: ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10: ".*redhat.*8-10.*minimal.*amd64.*" rhel-9-0: ".*redhat.*9-0.*minimal.*amd64.*" rhel-9-2: ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4: ".*redhat.*9-4.*minimal.*amd64.*" + sles-15-5: ".*sles.*15-5.*amd64-[0-9]" + sles-15-6: ".*sles.*15-6.*amd64-[0-9]" + # rhel-7-6-sap-ha: ".*redhat.*7-6.*amd64.*hana.*" # retrievable from deprecated list + # rhel-7-9-sap-ha: ".*redhat.*7-9.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-1-sap-ha: ".*redhat.*8-1.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-2-sap-ha: ".*redhat.*8-2.*amd64.*hana.*" # retrievable from deprecated list rhel-8-4-sap-ha: ".*redhat.*8-4.*amd64.*hana.*" rhel-8-6-sap-ha: ".*redhat.*8-6.*amd64.*hana.*" rhel-8-8-sap-ha: ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha: ".*redhat.*8-10.*amd64.*hana.*" rhel-9-0-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" - rhel-9-2-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha: ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha: ".*redhat.*9-4.*amd64.*hana.*" + # sles-12-4-sap-ha: ".*sles.*12-4.*amd64.*hana.*" # retrievable from deprecated list + # sles-12-5-sap-ha: ".*sles.*12-5.*amd64.*hana.*" # retrievable from deprecated list + # sles-15-1-sap-ha: ".*sles.*15-1.*amd64.*hana.*" # retrievable from deprecated list sles-15-3-sap-ha: ".*sles.*15-3.*amd64.*hana.*" sles-15-4-sap-ha: ".*sles.*15-4.*amd64.*hana.*" sles-15-5-sap-ha: ".*sles.*15-5.*amd64.*hana.*" + sles-15-6-sap-ha: ".*sles.*15-6.*amd64.*hana.*" sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: @@ -487,96 +551,186 @@ sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: #### sap_vm_provision_msazure_vm_host_os_image_dictionary: - + rhel-8-0: + publisher: "RedHat" + offer: "RHEL" + sku: "8-gen2" + rhel-8-1: + publisher: "RedHat" + offer: "RHEL" + sku: "81-gen2" + rhel-8-2: + publisher: "RedHat" + offer: "RHEL" + sku: "82-gen2" + rhel-8-3: + publisher: "RedHat" + offer: "RHEL" + sku: "83-gen2" rhel-8-4: publisher: "RedHat" offer: "RHEL" sku: "84-gen2" - + rhel-8-5: + publisher: "RedHat" + offer: "RHEL" + sku: "85-gen2" + rhel-8-6: + publisher: "RedHat" + offer: "RHEL" + sku: "86-gen2" + rhel-8-7: + publisher: "RedHat" + offer: "RHEL" + sku: "87-gen2" + rhel-8-8: + publisher: "RedHat" + offer: "RHEL" + sku: "88-gen2" + rhel-8-9: + publisher: "RedHat" + offer: "RHEL" + sku: "89-gen2" + rhel-8-10: + publisher: "RedHat" + offer: "RHEL" + sku: "810-gen2" + rhel-9-0: + publisher: "RedHat" + offer: "RHEL" + sku: "90-gen2" + rhel-9-1: + publisher: "RedHat" + offer: "RHEL" + sku: "91-gen2" + rhel-9-2: + publisher: "RedHat" + offer: "RHEL" + sku: "92-gen2" + rhel-9-3: + publisher: "RedHat" + offer: "RHEL" + sku: "93-gen2" + rhel-9-4: + publisher: "RedHat" + offer: "RHEL" + sku: "94-gen2" + sles-12-5: + publisher: "SUSE" + offer: "sles-12-sp5" + sku: "gen2" + sles-15-1: + publisher: "SUSE" + offer: "sles-15-sp1" + sku: "gen2" + sles-15-2: + publisher: "SUSE" + offer: "sles-15-sp2" + sku: "gen2" + sles-15-3: + publisher: "SUSE" + offer: "sles-15-sp3" + sku: "gen2" + sles-15-4: + publisher: "SUSE" + offer: "sles-15-sp4" + sku: "gen2" + sles-15-5: + publisher: "SUSE" + offer: "sles-15-sp5" + sku: "gen2" + sles-15-6: + publisher: "SUSE" + offer: "sles-15-sp6" + sku: "gen2" rhel-8-1-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "81sapha-gen2" - rhel-8-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "82sapha-gen2" - rhel-8-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "84sapha-gen2" - rhel-8-6-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "86sapha-gen2" - rhel-8-8-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "88sapha-gen2" - + rhel-8-10-sap-ha: + publisher: "RedHat" + offer: "RHEL-SAP-HA" + sku: "810sapha-gen2" rhel-9-0-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "90sapha-gen2" - rhel-9-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "92sapha-gen2" - - rhel-8-1-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "81sapapps-gen2" - - rhel-8-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "82sapapps-gen2" - - rhel-8-4-sap-applications: + rhel-9-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" - sku: "84sapapps-gen2" - - rhel-8-6-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "86sapapps-gen2" - - rhel-8-8-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "88sapapps-gen2" - - rhel-9-0-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "90sapapps-gen2" - - rhel-9-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "92sapapps-gen2" - - sles-15-sp3-sap: + sku: "94sapha-gen2" + sles-12-5-sap-ha: + publisher: "SUSE" + offer: "sles-sap-12-sp5" + sku: "gen2" + sles-15-1-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp1" + sku: "gen2" + sles-15-2-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp2" + sku: "gen2" + sles-15-3-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp3" sku: "gen2" - - sles-15-sp4-sap: + sles-15-4-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp4" sku: "gen2" - - sles-15-sp5-sap: + sles-15-5-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp5" sku: "gen2" + sles-15-6-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp6" + sku: "gen2" + sles-15-1-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp1-byos" + sku: "gen2" + sles-15-2-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp2-byos" + sku: "gen2" + sles-15-3-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp3-byos" + sku: "gen2" + sles-15-4-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp4-byos" + sku: "gen2" + sles-15-5-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp5-byos" + sku: "gen2" + sles-15-6-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp6-byos" + sku: "gen2" sap_vm_provision_msazure_vm_host_specifications_dictionary: diff --git a/deploy_scenarios/sap_nwas_abap_ibmdb2_sandbox/ansible_requirements.yml b/deploy_scenarios/sap_nwas_abap_ibmdb2_sandbox/ansible_requirements.yml index af7ed22..1454ec5 100644 --- a/deploy_scenarios/sap_nwas_abap_ibmdb2_sandbox/ansible_requirements.yml +++ b/deploy_scenarios/sap_nwas_abap_ibmdb2_sandbox/ansible_requirements.yml @@ -8,16 +8,16 @@ collections: version: 6.1.0 - name: fedora.linux_system_roles type: galaxy - version: 1.82.0 + version: 1.88.9 - name: community.sap_install type: galaxy - version: 1.4.0 + version: 1.5.0 - name: community.sap_launchpad type: galaxy - version: 1.1.0 + version: 1.1.1 - name: community.sap_infrastructure type: galaxy - version: 1.0.1 + version: 1.1.0 # - name: community.sap_operations # type: galaxy # version: 0.9.1 @@ -25,23 +25,23 @@ collections: # Collections for Infrastructure from Ansible Galaxy - name: cloud.terraform type: galaxy - version: 1.1.0 + version: 3.0.0 - name: amazon.aws type: galaxy - version: 7.2.0 + version: 9.0.0 - name: community.aws type: galaxy - version: 7.1.0 + version: 9.0.0 - name: azure.azcollection type: galaxy - version: 2.2.0 + version: 3.0.1 - name: google.cloud type: galaxy version: 1.1.3 # Replace with ibm.cloud in future, legacy Ansible Collection uses hidden on-the-fly Terraform files in /var/tmp/ansible/ibmcloud) - name: ibm.cloudcollection type: galaxy - version: 1.51.0 + version: 1.71.2 - name: ovirt.ovirt type: galaxy version: 3.1.2 @@ -53,21 +53,12 @@ collections: version: 3.0.0 - name: cloud.common type: galaxy - version: 3.0.0 + version: 4.0.0 # Collections from public repositories via HTTPS # - name: https://github.com/sap-linuxlab/community.sap_install.git # type: git # version: dev -# - name: https://github.com/sap-linuxlab/community.sap_launchpad.git -# type: git -# version: main -# - name: https://github.com/sap-linuxlab/community.sap_operations.git -# type: git -# version: main -# - name: https://github.com/ansible-collections/cloud.terraform.git -# type: git -# version: main # Collections from private repositories via use SSH (embedded GitHub PAT does not work) # Used for customised/forked Ansible Collections diff --git a/deploy_scenarios/sap_nwas_abap_ibmdb2_sandbox/optional/ansible_extravars_noninteractive.yml b/deploy_scenarios/sap_nwas_abap_ibmdb2_sandbox/optional/ansible_extravars_noninteractive.yml index b37eaba..e8b4639 100755 --- a/deploy_scenarios/sap_nwas_abap_ibmdb2_sandbox/optional/ansible_extravars_noninteractive.yml +++ b/deploy_scenarios/sap_nwas_abap_ibmdb2_sandbox/optional/ansible_extravars_noninteractive.yml @@ -270,7 +270,7 @@ sap_id_user: "ENTER_STRING_VALUE_HERE" sap_id_user_password: 'ENTER_STRING_VALUE_HERE' # Directory for SAP installation media -sap_software_download_directory: "ENTER_STRING_VALUE_HERE" +sap_install_media_detect_source_directory: "ENTER_STRING_VALUE_HERE" # e.g. /software #### # SAP SWPM, uses the Ansible Role sap_swpm with Default Templates mode diff --git a/deploy_scenarios/sap_nwas_abap_oracledb_sandbox/ansible_extravars.yml b/deploy_scenarios/sap_nwas_abap_oracledb_sandbox/ansible_extravars.yml index 61796bd..811d65d 100755 --- a/deploy_scenarios/sap_nwas_abap_oracledb_sandbox/ansible_extravars.yml +++ b/deploy_scenarios/sap_nwas_abap_oracledb_sandbox/ansible_extravars.yml @@ -240,27 +240,43 @@ sap_swpm_templates_install_dictionary: sap_vm_provision_aws_ec2_vs_host_os_image_dictionary: rhel-8-1: "*RHEL-8.1*_HVM*x86_64*" - rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" + # rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" # removed rhel-8-4: "*RHEL-8.4*_HVM*x86_64*" rhel-8-6: "*RHEL-8.6*_HVM*x86_64*" rhel-8-8: "*RHEL-8.8*_HVM*x86_64*" + rhel-8-10: "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0: "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1: "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2: "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3: "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4: "*RHEL-9.4*_HVM*x86_64*" + sles-12-5: "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" # removed + # sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" # removed + # sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" # removed + sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6: "*suse-sles-15-sp6-v202*-hvm-ssd-x86_64*" + # rhel-7-7-sap-ha: "*RHEL-SAP-8.1.0*" # removed + # rhel-7-9-sap-ha: "*RHEL-SAP-8.1.0*" # removed rhel-8-1-sap-ha: "*RHEL-SAP-8.1.0*" rhel-8-2-sap-ha: "*RHEL-SAP-8.2.0*" rhel-8-4-sap-ha: "*RHEL-SAP-8.4.0*" rhel-8-6-sap-ha: "*RHEL-SAP-8.6.0*" rhel-8-8-sap-ha: "*RHEL-SAP-8.8.0*" + rhel-8-10-sap-ha: "*RHEL-SAP-8.10.0*" rhel-9-0-sap-ha: "*RHEL-SAP-9.0.0*" rhel-9-2-sap-ha: "*RHEL-SAP-9.2.0*" - sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" - sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" - sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" - sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + rhel-9-4-sap-ha: "*RHEL-SAP-9.4.0*" sles-12-5-sap-ha: "*suse-sles-sap-12-sp5-v202*-hvm-ssd-x86_64*" sles-15-1-sap-ha: "*suse-sles-sap-15-sp1-v202*-hvm-ssd-x86_64*" sles-15-2-sap-ha: "*suse-sles-sap-15-sp2-v202*-hvm-ssd-x86_64*" sles-15-3-sap-ha: "*suse-sles-sap-15-sp3-v202*-hvm-ssd-x86_64*" sles-15-4-sap-ha: "*suse-sles-sap-15-sp4-v202*-hvm-ssd-x86_64*" sles-15-5-sap-ha: "*suse-sles-sap-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha: "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" + sles-15-4-sap-ha-byos: "*suse-sles-sap-15-sp4-byos-v202*-hvm-ssd-x86_64*" + sles-15-5-sap-ha-byos: "*suse-sles-sap-15-sp5-byos-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha-byos: "*suse-sles-sap-15-sp6-byos-v202*-hvm-ssd-x86_64*" sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: @@ -338,42 +354,75 @@ sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: #### sap_vm_provision_gcp_ce_vm_host_os_image_dictionary: - rhel-8-latest: project: "rhel-cloud" family: "rhel-8" - - rhel-8-1-sap-ha: + rhel-9-latest: + project: "rhel-cloud" + family: "rhel-9" + sles-12-latest: + project: "suse-cloud" + family: "sles-12" + sles-15-latest: + project: "suse-cloud" + family: "sles-15" + # rhel-7-7-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-7-7-sap-ha" + rhel-7-9-sap-ha: project: "rhel-sap-cloud" - family: "rhel-8-1-sap-ha" - + family: "rhel-7-9-sap-ha" + # rhel-8-1-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-8-1-sap-ha" rhel-8-2-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-2-sap-ha" - rhel-8-4-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-4-sap-ha" - rhel-8-6-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-6-sap-ha" - - sles-15-latest: - project: "suse-cloud" - family: "sles-15" - - sles-15-sp3-sap: + sles-12-5-sap-ha: + project: "suse-sap-cloud" + family: "sles-12-sp5-sap" + # sles-15-1-sap-ha: # removed + # project: "suse-sap-cloud" + # family: "sles-15-sp1-sap" + sles-15-2-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp2-sap" + sles-15-3-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp3-sap" - - sles-15-sp4-sap: + sles-15-4-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp4-sap" - - sles-15-sp5-sap: + sles-15-5-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp5-sap" + sles-15-6-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp6-sap" + sles-12-5-sap-ha-byos: + project: "suse-byos-cloud" + family: "sles-12-sp5-sap-byos" + sles-15-2-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp2-sap-byos" + sles-15-3-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp3-sap-byos" + sles-15-4-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp4-sap-byos" + sles-15-5-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp5-sap-byos" + sles-15-6-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp6-sap-byos" sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: @@ -456,16 +505,31 @@ sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: sap_vm_provision_ibmcloud_vs_host_os_image_dictionary: rhel-8-4: ".*redhat.*8-4.*minimal.*amd64.*" rhel-8-6: ".*redhat.*8-6.*minimal.*amd64.*" + rhel-8-8: ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10: ".*redhat.*8-10.*minimal.*amd64.*" rhel-9-0: ".*redhat.*9-0.*minimal.*amd64.*" rhel-9-2: ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4: ".*redhat.*9-4.*minimal.*amd64.*" + sles-15-5: ".*sles.*15-5.*amd64-[0-9]" + sles-15-6: ".*sles.*15-6.*amd64-[0-9]" + # rhel-7-6-sap-ha: ".*redhat.*7-6.*amd64.*hana.*" # retrievable from deprecated list + # rhel-7-9-sap-ha: ".*redhat.*7-9.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-1-sap-ha: ".*redhat.*8-1.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-2-sap-ha: ".*redhat.*8-2.*amd64.*hana.*" # retrievable from deprecated list rhel-8-4-sap-ha: ".*redhat.*8-4.*amd64.*hana.*" rhel-8-6-sap-ha: ".*redhat.*8-6.*amd64.*hana.*" rhel-8-8-sap-ha: ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha: ".*redhat.*8-10.*amd64.*hana.*" rhel-9-0-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" - rhel-9-2-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha: ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha: ".*redhat.*9-4.*amd64.*hana.*" + # sles-12-4-sap-ha: ".*sles.*12-4.*amd64.*hana.*" # retrievable from deprecated list + # sles-12-5-sap-ha: ".*sles.*12-5.*amd64.*hana.*" # retrievable from deprecated list + # sles-15-1-sap-ha: ".*sles.*15-1.*amd64.*hana.*" # retrievable from deprecated list sles-15-3-sap-ha: ".*sles.*15-3.*amd64.*hana.*" sles-15-4-sap-ha: ".*sles.*15-4.*amd64.*hana.*" sles-15-5-sap-ha: ".*sles.*15-5.*amd64.*hana.*" + sles-15-6-sap-ha: ".*sles.*15-6.*amd64.*hana.*" sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: @@ -550,96 +614,186 @@ sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: #### sap_vm_provision_msazure_vm_host_os_image_dictionary: - + rhel-8-0: + publisher: "RedHat" + offer: "RHEL" + sku: "8-gen2" + rhel-8-1: + publisher: "RedHat" + offer: "RHEL" + sku: "81-gen2" + rhel-8-2: + publisher: "RedHat" + offer: "RHEL" + sku: "82-gen2" + rhel-8-3: + publisher: "RedHat" + offer: "RHEL" + sku: "83-gen2" rhel-8-4: publisher: "RedHat" offer: "RHEL" sku: "84-gen2" - + rhel-8-5: + publisher: "RedHat" + offer: "RHEL" + sku: "85-gen2" + rhel-8-6: + publisher: "RedHat" + offer: "RHEL" + sku: "86-gen2" + rhel-8-7: + publisher: "RedHat" + offer: "RHEL" + sku: "87-gen2" + rhel-8-8: + publisher: "RedHat" + offer: "RHEL" + sku: "88-gen2" + rhel-8-9: + publisher: "RedHat" + offer: "RHEL" + sku: "89-gen2" + rhel-8-10: + publisher: "RedHat" + offer: "RHEL" + sku: "810-gen2" + rhel-9-0: + publisher: "RedHat" + offer: "RHEL" + sku: "90-gen2" + rhel-9-1: + publisher: "RedHat" + offer: "RHEL" + sku: "91-gen2" + rhel-9-2: + publisher: "RedHat" + offer: "RHEL" + sku: "92-gen2" + rhel-9-3: + publisher: "RedHat" + offer: "RHEL" + sku: "93-gen2" + rhel-9-4: + publisher: "RedHat" + offer: "RHEL" + sku: "94-gen2" + sles-12-5: + publisher: "SUSE" + offer: "sles-12-sp5" + sku: "gen2" + sles-15-1: + publisher: "SUSE" + offer: "sles-15-sp1" + sku: "gen2" + sles-15-2: + publisher: "SUSE" + offer: "sles-15-sp2" + sku: "gen2" + sles-15-3: + publisher: "SUSE" + offer: "sles-15-sp3" + sku: "gen2" + sles-15-4: + publisher: "SUSE" + offer: "sles-15-sp4" + sku: "gen2" + sles-15-5: + publisher: "SUSE" + offer: "sles-15-sp5" + sku: "gen2" + sles-15-6: + publisher: "SUSE" + offer: "sles-15-sp6" + sku: "gen2" rhel-8-1-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "81sapha-gen2" - rhel-8-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "82sapha-gen2" - rhel-8-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "84sapha-gen2" - rhel-8-6-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "86sapha-gen2" - rhel-8-8-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "88sapha-gen2" - + rhel-8-10-sap-ha: + publisher: "RedHat" + offer: "RHEL-SAP-HA" + sku: "810sapha-gen2" rhel-9-0-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "90sapha-gen2" - rhel-9-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "92sapha-gen2" - - rhel-8-1-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "81sapapps-gen2" - - rhel-8-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "82sapapps-gen2" - - rhel-8-4-sap-applications: + rhel-9-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" - sku: "84sapapps-gen2" - - rhel-8-6-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "86sapapps-gen2" - - rhel-8-8-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "88sapapps-gen2" - - rhel-9-0-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "90sapapps-gen2" - - rhel-9-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "92sapapps-gen2" - - sles-15-sp3-sap: + sku: "94sapha-gen2" + sles-12-5-sap-ha: + publisher: "SUSE" + offer: "sles-sap-12-sp5" + sku: "gen2" + sles-15-1-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp1" + sku: "gen2" + sles-15-2-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp2" + sku: "gen2" + sles-15-3-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp3" sku: "gen2" - - sles-15-sp4-sap: + sles-15-4-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp4" sku: "gen2" - - sles-15-sp5-sap: + sles-15-5-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp5" sku: "gen2" + sles-15-6-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp6" + sku: "gen2" + sles-15-1-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp1-byos" + sku: "gen2" + sles-15-2-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp2-byos" + sku: "gen2" + sles-15-3-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp3-byos" + sku: "gen2" + sles-15-4-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp4-byos" + sku: "gen2" + sles-15-5-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp5-byos" + sku: "gen2" + sles-15-6-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp6-byos" + sku: "gen2" sap_vm_provision_msazure_vm_host_specifications_dictionary: diff --git a/deploy_scenarios/sap_nwas_abap_oracledb_sandbox/ansible_requirements.yml b/deploy_scenarios/sap_nwas_abap_oracledb_sandbox/ansible_requirements.yml index af7ed22..1454ec5 100644 --- a/deploy_scenarios/sap_nwas_abap_oracledb_sandbox/ansible_requirements.yml +++ b/deploy_scenarios/sap_nwas_abap_oracledb_sandbox/ansible_requirements.yml @@ -8,16 +8,16 @@ collections: version: 6.1.0 - name: fedora.linux_system_roles type: galaxy - version: 1.82.0 + version: 1.88.9 - name: community.sap_install type: galaxy - version: 1.4.0 + version: 1.5.0 - name: community.sap_launchpad type: galaxy - version: 1.1.0 + version: 1.1.1 - name: community.sap_infrastructure type: galaxy - version: 1.0.1 + version: 1.1.0 # - name: community.sap_operations # type: galaxy # version: 0.9.1 @@ -25,23 +25,23 @@ collections: # Collections for Infrastructure from Ansible Galaxy - name: cloud.terraform type: galaxy - version: 1.1.0 + version: 3.0.0 - name: amazon.aws type: galaxy - version: 7.2.0 + version: 9.0.0 - name: community.aws type: galaxy - version: 7.1.0 + version: 9.0.0 - name: azure.azcollection type: galaxy - version: 2.2.0 + version: 3.0.1 - name: google.cloud type: galaxy version: 1.1.3 # Replace with ibm.cloud in future, legacy Ansible Collection uses hidden on-the-fly Terraform files in /var/tmp/ansible/ibmcloud) - name: ibm.cloudcollection type: galaxy - version: 1.51.0 + version: 1.71.2 - name: ovirt.ovirt type: galaxy version: 3.1.2 @@ -53,21 +53,12 @@ collections: version: 3.0.0 - name: cloud.common type: galaxy - version: 3.0.0 + version: 4.0.0 # Collections from public repositories via HTTPS # - name: https://github.com/sap-linuxlab/community.sap_install.git # type: git # version: dev -# - name: https://github.com/sap-linuxlab/community.sap_launchpad.git -# type: git -# version: main -# - name: https://github.com/sap-linuxlab/community.sap_operations.git -# type: git -# version: main -# - name: https://github.com/ansible-collections/cloud.terraform.git -# type: git -# version: main # Collections from private repositories via use SSH (embedded GitHub PAT does not work) # Used for customised/forked Ansible Collections diff --git a/deploy_scenarios/sap_nwas_abap_oracledb_sandbox/optional/ansible_extravars_noninteractive.yml b/deploy_scenarios/sap_nwas_abap_oracledb_sandbox/optional/ansible_extravars_noninteractive.yml index d9f7bf6..5626241 100755 --- a/deploy_scenarios/sap_nwas_abap_oracledb_sandbox/optional/ansible_extravars_noninteractive.yml +++ b/deploy_scenarios/sap_nwas_abap_oracledb_sandbox/optional/ansible_extravars_noninteractive.yml @@ -270,7 +270,7 @@ sap_id_user: "ENTER_STRING_VALUE_HERE" sap_id_user_password: 'ENTER_STRING_VALUE_HERE' # Directory for SAP installation media -sap_software_download_directory: "ENTER_STRING_VALUE_HERE" +sap_install_media_detect_source_directory: "ENTER_STRING_VALUE_HERE" # e.g. /software #### diff --git a/deploy_scenarios/sap_nwas_abap_sapase_sandbox/ansible_extravars.yml b/deploy_scenarios/sap_nwas_abap_sapase_sandbox/ansible_extravars.yml index cffc841..efa7503 100755 --- a/deploy_scenarios/sap_nwas_abap_sapase_sandbox/ansible_extravars.yml +++ b/deploy_scenarios/sap_nwas_abap_sapase_sandbox/ansible_extravars.yml @@ -128,7 +128,7 @@ sap_swpm_templates_install_dictionary: - 'igsexe_13-80003187.sar' # IGS 7.53 - 'igshelper_17-10010245.sar' - 'SYBCTRL_1423-80002616.SAR' - - '51057804_1' # SAP ASE 16.0.04.06 RDBMS Linux on x86_64 64bit + - '51057961_1' # SAP ASE 16.0.04.06 HF1 RDBMS Linux on x86_64 64bit - 'ASEBC16004P_5-20012477.SAR' # SAP ASE 16.0 SP04 (160-04) FOR BUS. SUITE DBCLIENT with Patch (P_*) - '51051806_1' # NetWeaver AS ABAP 7.52 Innovation Pkg - Installation Exp 1/2, RAR - '51051806_2' # NetWeaver AS ABAP 7.52 Innovation Pkg - Installation Exp 2/2, RAR @@ -183,7 +183,7 @@ sap_swpm_templates_install_dictionary: - 'igsexe_13-80003187.sar' # IGS 7.53 - 'igshelper_17-10010245.sar' - 'SYBCTRL_1423-80002616.SAR' - - '51057804_1' # SAP ASE 16.0.04.06 RDBMS Linux on x86_64 64bit + - '51057961_1' # SAP ASE 16.0.04.06 HF1 RDBMS Linux on x86_64 64bit - 'ASEBC16004P_5-20012477.SAR' # SAP ASE 16.0 SP04 (160-04) FOR BUS. SUITE DBCLIENT with Patch (P_*) - '51050829_3' # SAP Netweaver 7.5 Installation Export, ZIP # - '51050829_4' # NW 7.5 Language 1/2 @@ -205,27 +205,43 @@ sap_swpm_templates_install_dictionary: sap_vm_provision_aws_ec2_vs_host_os_image_dictionary: rhel-8-1: "*RHEL-8.1*_HVM*x86_64*" - rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" + # rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" # removed rhel-8-4: "*RHEL-8.4*_HVM*x86_64*" rhel-8-6: "*RHEL-8.6*_HVM*x86_64*" rhel-8-8: "*RHEL-8.8*_HVM*x86_64*" + rhel-8-10: "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0: "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1: "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2: "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3: "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4: "*RHEL-9.4*_HVM*x86_64*" + sles-12-5: "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" # removed + # sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" # removed + # sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" # removed + sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6: "*suse-sles-15-sp6-v202*-hvm-ssd-x86_64*" + # rhel-7-7-sap-ha: "*RHEL-SAP-8.1.0*" # removed + # rhel-7-9-sap-ha: "*RHEL-SAP-8.1.0*" # removed rhel-8-1-sap-ha: "*RHEL-SAP-8.1.0*" rhel-8-2-sap-ha: "*RHEL-SAP-8.2.0*" rhel-8-4-sap-ha: "*RHEL-SAP-8.4.0*" rhel-8-6-sap-ha: "*RHEL-SAP-8.6.0*" rhel-8-8-sap-ha: "*RHEL-SAP-8.8.0*" + rhel-8-10-sap-ha: "*RHEL-SAP-8.10.0*" rhel-9-0-sap-ha: "*RHEL-SAP-9.0.0*" rhel-9-2-sap-ha: "*RHEL-SAP-9.2.0*" - sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" - sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" - sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" - sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + rhel-9-4-sap-ha: "*RHEL-SAP-9.4.0*" sles-12-5-sap-ha: "*suse-sles-sap-12-sp5-v202*-hvm-ssd-x86_64*" sles-15-1-sap-ha: "*suse-sles-sap-15-sp1-v202*-hvm-ssd-x86_64*" sles-15-2-sap-ha: "*suse-sles-sap-15-sp2-v202*-hvm-ssd-x86_64*" sles-15-3-sap-ha: "*suse-sles-sap-15-sp3-v202*-hvm-ssd-x86_64*" sles-15-4-sap-ha: "*suse-sles-sap-15-sp4-v202*-hvm-ssd-x86_64*" sles-15-5-sap-ha: "*suse-sles-sap-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha: "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" + sles-15-4-sap-ha-byos: "*suse-sles-sap-15-sp4-byos-v202*-hvm-ssd-x86_64*" + sles-15-5-sap-ha-byos: "*suse-sles-sap-15-sp5-byos-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha-byos: "*suse-sles-sap-15-sp6-byos-v202*-hvm-ssd-x86_64*" sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: @@ -293,42 +309,75 @@ sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: #### sap_vm_provision_gcp_ce_vm_host_os_image_dictionary: - rhel-8-latest: project: "rhel-cloud" family: "rhel-8" - - rhel-8-1-sap-ha: + rhel-9-latest: + project: "rhel-cloud" + family: "rhel-9" + sles-12-latest: + project: "suse-cloud" + family: "sles-12" + sles-15-latest: + project: "suse-cloud" + family: "sles-15" + # rhel-7-7-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-7-7-sap-ha" + rhel-7-9-sap-ha: project: "rhel-sap-cloud" - family: "rhel-8-1-sap-ha" - + family: "rhel-7-9-sap-ha" + # rhel-8-1-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-8-1-sap-ha" rhel-8-2-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-2-sap-ha" - rhel-8-4-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-4-sap-ha" - rhel-8-6-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-6-sap-ha" - - sles-15-latest: - project: "suse-cloud" - family: "sles-15" - - sles-15-sp3-sap: + sles-12-5-sap-ha: + project: "suse-sap-cloud" + family: "sles-12-sp5-sap" + # sles-15-1-sap-ha: # removed + # project: "suse-sap-cloud" + # family: "sles-15-sp1-sap" + sles-15-2-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp2-sap" + sles-15-3-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp3-sap" - - sles-15-sp4-sap: + sles-15-4-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp4-sap" - - sles-15-sp5-sap: + sles-15-5-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp5-sap" + sles-15-6-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp6-sap" + sles-12-5-sap-ha-byos: + project: "suse-byos-cloud" + family: "sles-12-sp5-sap-byos" + sles-15-2-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp2-sap-byos" + sles-15-3-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp3-sap-byos" + sles-15-4-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp4-sap-byos" + sles-15-5-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp5-sap-byos" + sles-15-6-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp6-sap-byos" sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: @@ -403,16 +452,31 @@ sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: sap_vm_provision_ibmcloud_vs_host_os_image_dictionary: rhel-8-4: ".*redhat.*8-4.*minimal.*amd64.*" rhel-8-6: ".*redhat.*8-6.*minimal.*amd64.*" + rhel-8-8: ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10: ".*redhat.*8-10.*minimal.*amd64.*" rhel-9-0: ".*redhat.*9-0.*minimal.*amd64.*" rhel-9-2: ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4: ".*redhat.*9-4.*minimal.*amd64.*" + sles-15-5: ".*sles.*15-5.*amd64-[0-9]" + sles-15-6: ".*sles.*15-6.*amd64-[0-9]" + # rhel-7-6-sap-ha: ".*redhat.*7-6.*amd64.*hana.*" # retrievable from deprecated list + # rhel-7-9-sap-ha: ".*redhat.*7-9.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-1-sap-ha: ".*redhat.*8-1.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-2-sap-ha: ".*redhat.*8-2.*amd64.*hana.*" # retrievable from deprecated list rhel-8-4-sap-ha: ".*redhat.*8-4.*amd64.*hana.*" rhel-8-6-sap-ha: ".*redhat.*8-6.*amd64.*hana.*" rhel-8-8-sap-ha: ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha: ".*redhat.*8-10.*amd64.*hana.*" rhel-9-0-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" - rhel-9-2-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha: ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha: ".*redhat.*9-4.*amd64.*hana.*" + # sles-12-4-sap-ha: ".*sles.*12-4.*amd64.*hana.*" # retrievable from deprecated list + # sles-12-5-sap-ha: ".*sles.*12-5.*amd64.*hana.*" # retrievable from deprecated list + # sles-15-1-sap-ha: ".*sles.*15-1.*amd64.*hana.*" # retrievable from deprecated list sles-15-3-sap-ha: ".*sles.*15-3.*amd64.*hana.*" sles-15-4-sap-ha: ".*sles.*15-4.*amd64.*hana.*" sles-15-5-sap-ha: ".*sles.*15-5.*amd64.*hana.*" + sles-15-6-sap-ha: ".*sles.*15-6.*amd64.*hana.*" sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: @@ -485,96 +549,186 @@ sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: #### sap_vm_provision_msazure_vm_host_os_image_dictionary: - + rhel-8-0: + publisher: "RedHat" + offer: "RHEL" + sku: "8-gen2" + rhel-8-1: + publisher: "RedHat" + offer: "RHEL" + sku: "81-gen2" + rhel-8-2: + publisher: "RedHat" + offer: "RHEL" + sku: "82-gen2" + rhel-8-3: + publisher: "RedHat" + offer: "RHEL" + sku: "83-gen2" rhel-8-4: publisher: "RedHat" offer: "RHEL" sku: "84-gen2" - + rhel-8-5: + publisher: "RedHat" + offer: "RHEL" + sku: "85-gen2" + rhel-8-6: + publisher: "RedHat" + offer: "RHEL" + sku: "86-gen2" + rhel-8-7: + publisher: "RedHat" + offer: "RHEL" + sku: "87-gen2" + rhel-8-8: + publisher: "RedHat" + offer: "RHEL" + sku: "88-gen2" + rhel-8-9: + publisher: "RedHat" + offer: "RHEL" + sku: "89-gen2" + rhel-8-10: + publisher: "RedHat" + offer: "RHEL" + sku: "810-gen2" + rhel-9-0: + publisher: "RedHat" + offer: "RHEL" + sku: "90-gen2" + rhel-9-1: + publisher: "RedHat" + offer: "RHEL" + sku: "91-gen2" + rhel-9-2: + publisher: "RedHat" + offer: "RHEL" + sku: "92-gen2" + rhel-9-3: + publisher: "RedHat" + offer: "RHEL" + sku: "93-gen2" + rhel-9-4: + publisher: "RedHat" + offer: "RHEL" + sku: "94-gen2" + sles-12-5: + publisher: "SUSE" + offer: "sles-12-sp5" + sku: "gen2" + sles-15-1: + publisher: "SUSE" + offer: "sles-15-sp1" + sku: "gen2" + sles-15-2: + publisher: "SUSE" + offer: "sles-15-sp2" + sku: "gen2" + sles-15-3: + publisher: "SUSE" + offer: "sles-15-sp3" + sku: "gen2" + sles-15-4: + publisher: "SUSE" + offer: "sles-15-sp4" + sku: "gen2" + sles-15-5: + publisher: "SUSE" + offer: "sles-15-sp5" + sku: "gen2" + sles-15-6: + publisher: "SUSE" + offer: "sles-15-sp6" + sku: "gen2" rhel-8-1-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "81sapha-gen2" - rhel-8-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "82sapha-gen2" - rhel-8-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "84sapha-gen2" - rhel-8-6-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "86sapha-gen2" - rhel-8-8-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "88sapha-gen2" - + rhel-8-10-sap-ha: + publisher: "RedHat" + offer: "RHEL-SAP-HA" + sku: "810sapha-gen2" rhel-9-0-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "90sapha-gen2" - rhel-9-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "92sapha-gen2" - - rhel-8-1-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "81sapapps-gen2" - - rhel-8-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "82sapapps-gen2" - - rhel-8-4-sap-applications: + rhel-9-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" - sku: "84sapapps-gen2" - - rhel-8-6-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "86sapapps-gen2" - - rhel-8-8-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "88sapapps-gen2" - - rhel-9-0-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "90sapapps-gen2" - - rhel-9-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "92sapapps-gen2" - - sles-15-sp3-sap: + sku: "94sapha-gen2" + sles-12-5-sap-ha: + publisher: "SUSE" + offer: "sles-sap-12-sp5" + sku: "gen2" + sles-15-1-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp1" + sku: "gen2" + sles-15-2-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp2" + sku: "gen2" + sles-15-3-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp3" sku: "gen2" - - sles-15-sp4-sap: + sles-15-4-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp4" sku: "gen2" - - sles-15-sp5-sap: + sles-15-5-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp5" sku: "gen2" + sles-15-6-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp6" + sku: "gen2" + sles-15-1-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp1-byos" + sku: "gen2" + sles-15-2-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp2-byos" + sku: "gen2" + sles-15-3-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp3-byos" + sku: "gen2" + sles-15-4-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp4-byos" + sku: "gen2" + sles-15-5-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp5-byos" + sku: "gen2" + sles-15-6-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp6-byos" + sku: "gen2" sap_vm_provision_msazure_vm_host_specifications_dictionary: diff --git a/deploy_scenarios/sap_nwas_abap_sapase_sandbox/ansible_requirements.yml b/deploy_scenarios/sap_nwas_abap_sapase_sandbox/ansible_requirements.yml index af7ed22..1454ec5 100644 --- a/deploy_scenarios/sap_nwas_abap_sapase_sandbox/ansible_requirements.yml +++ b/deploy_scenarios/sap_nwas_abap_sapase_sandbox/ansible_requirements.yml @@ -8,16 +8,16 @@ collections: version: 6.1.0 - name: fedora.linux_system_roles type: galaxy - version: 1.82.0 + version: 1.88.9 - name: community.sap_install type: galaxy - version: 1.4.0 + version: 1.5.0 - name: community.sap_launchpad type: galaxy - version: 1.1.0 + version: 1.1.1 - name: community.sap_infrastructure type: galaxy - version: 1.0.1 + version: 1.1.0 # - name: community.sap_operations # type: galaxy # version: 0.9.1 @@ -25,23 +25,23 @@ collections: # Collections for Infrastructure from Ansible Galaxy - name: cloud.terraform type: galaxy - version: 1.1.0 + version: 3.0.0 - name: amazon.aws type: galaxy - version: 7.2.0 + version: 9.0.0 - name: community.aws type: galaxy - version: 7.1.0 + version: 9.0.0 - name: azure.azcollection type: galaxy - version: 2.2.0 + version: 3.0.1 - name: google.cloud type: galaxy version: 1.1.3 # Replace with ibm.cloud in future, legacy Ansible Collection uses hidden on-the-fly Terraform files in /var/tmp/ansible/ibmcloud) - name: ibm.cloudcollection type: galaxy - version: 1.51.0 + version: 1.71.2 - name: ovirt.ovirt type: galaxy version: 3.1.2 @@ -53,21 +53,12 @@ collections: version: 3.0.0 - name: cloud.common type: galaxy - version: 3.0.0 + version: 4.0.0 # Collections from public repositories via HTTPS # - name: https://github.com/sap-linuxlab/community.sap_install.git # type: git # version: dev -# - name: https://github.com/sap-linuxlab/community.sap_launchpad.git -# type: git -# version: main -# - name: https://github.com/sap-linuxlab/community.sap_operations.git -# type: git -# version: main -# - name: https://github.com/ansible-collections/cloud.terraform.git -# type: git -# version: main # Collections from private repositories via use SSH (embedded GitHub PAT does not work) # Used for customised/forked Ansible Collections diff --git a/deploy_scenarios/sap_nwas_abap_sapase_sandbox/optional/ansible_extravars_noninteractive.yml b/deploy_scenarios/sap_nwas_abap_sapase_sandbox/optional/ansible_extravars_noninteractive.yml index eec6aac..6085776 100755 --- a/deploy_scenarios/sap_nwas_abap_sapase_sandbox/optional/ansible_extravars_noninteractive.yml +++ b/deploy_scenarios/sap_nwas_abap_sapase_sandbox/optional/ansible_extravars_noninteractive.yml @@ -270,7 +270,7 @@ sap_id_user: "ENTER_STRING_VALUE_HERE" sap_id_user_password: 'ENTER_STRING_VALUE_HERE' # Directory for SAP installation media -sap_software_download_directory: "ENTER_STRING_VALUE_HERE" +sap_install_media_detect_source_directory: "ENTER_STRING_VALUE_HERE" # e.g. /software #### diff --git a/deploy_scenarios/sap_nwas_abap_sapmaxdb_sandbox/ansible_extravars.yml b/deploy_scenarios/sap_nwas_abap_sapmaxdb_sandbox/ansible_extravars.yml index b3dc905..ba85320 100755 --- a/deploy_scenarios/sap_nwas_abap_sapmaxdb_sandbox/ansible_extravars.yml +++ b/deploy_scenarios/sap_nwas_abap_sapmaxdb_sandbox/ansible_extravars.yml @@ -203,27 +203,43 @@ sap_swpm_templates_install_dictionary: sap_vm_provision_aws_ec2_vs_host_os_image_dictionary: rhel-8-1: "*RHEL-8.1*_HVM*x86_64*" - rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" + # rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" # removed rhel-8-4: "*RHEL-8.4*_HVM*x86_64*" rhel-8-6: "*RHEL-8.6*_HVM*x86_64*" rhel-8-8: "*RHEL-8.8*_HVM*x86_64*" + rhel-8-10: "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0: "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1: "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2: "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3: "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4: "*RHEL-9.4*_HVM*x86_64*" + sles-12-5: "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" # removed + # sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" # removed + # sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" # removed + sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6: "*suse-sles-15-sp6-v202*-hvm-ssd-x86_64*" + # rhel-7-7-sap-ha: "*RHEL-SAP-8.1.0*" # removed + # rhel-7-9-sap-ha: "*RHEL-SAP-8.1.0*" # removed rhel-8-1-sap-ha: "*RHEL-SAP-8.1.0*" rhel-8-2-sap-ha: "*RHEL-SAP-8.2.0*" rhel-8-4-sap-ha: "*RHEL-SAP-8.4.0*" rhel-8-6-sap-ha: "*RHEL-SAP-8.6.0*" rhel-8-8-sap-ha: "*RHEL-SAP-8.8.0*" + rhel-8-10-sap-ha: "*RHEL-SAP-8.10.0*" rhel-9-0-sap-ha: "*RHEL-SAP-9.0.0*" rhel-9-2-sap-ha: "*RHEL-SAP-9.2.0*" - sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" - sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" - sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" - sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + rhel-9-4-sap-ha: "*RHEL-SAP-9.4.0*" sles-12-5-sap-ha: "*suse-sles-sap-12-sp5-v202*-hvm-ssd-x86_64*" sles-15-1-sap-ha: "*suse-sles-sap-15-sp1-v202*-hvm-ssd-x86_64*" sles-15-2-sap-ha: "*suse-sles-sap-15-sp2-v202*-hvm-ssd-x86_64*" sles-15-3-sap-ha: "*suse-sles-sap-15-sp3-v202*-hvm-ssd-x86_64*" sles-15-4-sap-ha: "*suse-sles-sap-15-sp4-v202*-hvm-ssd-x86_64*" sles-15-5-sap-ha: "*suse-sles-sap-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha: "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" + sles-15-4-sap-ha-byos: "*suse-sles-sap-15-sp4-byos-v202*-hvm-ssd-x86_64*" + sles-15-5-sap-ha-byos: "*suse-sles-sap-15-sp5-byos-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha-byos: "*suse-sles-sap-15-sp6-byos-v202*-hvm-ssd-x86_64*" sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: @@ -291,42 +307,75 @@ sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: #### sap_vm_provision_gcp_ce_vm_host_os_image_dictionary: - rhel-8-latest: project: "rhel-cloud" family: "rhel-8" - - rhel-8-1-sap-ha: + rhel-9-latest: + project: "rhel-cloud" + family: "rhel-9" + sles-12-latest: + project: "suse-cloud" + family: "sles-12" + sles-15-latest: + project: "suse-cloud" + family: "sles-15" + # rhel-7-7-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-7-7-sap-ha" + rhel-7-9-sap-ha: project: "rhel-sap-cloud" - family: "rhel-8-1-sap-ha" - + family: "rhel-7-9-sap-ha" + # rhel-8-1-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-8-1-sap-ha" rhel-8-2-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-2-sap-ha" - rhel-8-4-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-4-sap-ha" - rhel-8-6-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-6-sap-ha" - - sles-15-latest: - project: "suse-cloud" - family: "sles-15" - - sles-15-sp3-sap: + sles-12-5-sap-ha: + project: "suse-sap-cloud" + family: "sles-12-sp5-sap" + # sles-15-1-sap-ha: # removed + # project: "suse-sap-cloud" + # family: "sles-15-sp1-sap" + sles-15-2-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp2-sap" + sles-15-3-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp3-sap" - - sles-15-sp4-sap: + sles-15-4-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp4-sap" - - sles-15-sp5-sap: + sles-15-5-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp5-sap" + sles-15-6-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp6-sap" + sles-12-5-sap-ha-byos: + project: "suse-byos-cloud" + family: "sles-12-sp5-sap-byos" + sles-15-2-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp2-sap-byos" + sles-15-3-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp3-sap-byos" + sles-15-4-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp4-sap-byos" + sles-15-5-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp5-sap-byos" + sles-15-6-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp6-sap-byos" sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: @@ -401,16 +450,31 @@ sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: sap_vm_provision_ibmcloud_vs_host_os_image_dictionary: rhel-8-4: ".*redhat.*8-4.*minimal.*amd64.*" rhel-8-6: ".*redhat.*8-6.*minimal.*amd64.*" + rhel-8-8: ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10: ".*redhat.*8-10.*minimal.*amd64.*" rhel-9-0: ".*redhat.*9-0.*minimal.*amd64.*" rhel-9-2: ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4: ".*redhat.*9-4.*minimal.*amd64.*" + sles-15-5: ".*sles.*15-5.*amd64-[0-9]" + sles-15-6: ".*sles.*15-6.*amd64-[0-9]" + # rhel-7-6-sap-ha: ".*redhat.*7-6.*amd64.*hana.*" # retrievable from deprecated list + # rhel-7-9-sap-ha: ".*redhat.*7-9.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-1-sap-ha: ".*redhat.*8-1.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-2-sap-ha: ".*redhat.*8-2.*amd64.*hana.*" # retrievable from deprecated list rhel-8-4-sap-ha: ".*redhat.*8-4.*amd64.*hana.*" rhel-8-6-sap-ha: ".*redhat.*8-6.*amd64.*hana.*" rhel-8-8-sap-ha: ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha: ".*redhat.*8-10.*amd64.*hana.*" rhel-9-0-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" - rhel-9-2-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha: ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha: ".*redhat.*9-4.*amd64.*hana.*" + # sles-12-4-sap-ha: ".*sles.*12-4.*amd64.*hana.*" # retrievable from deprecated list + # sles-12-5-sap-ha: ".*sles.*12-5.*amd64.*hana.*" # retrievable from deprecated list + # sles-15-1-sap-ha: ".*sles.*15-1.*amd64.*hana.*" # retrievable from deprecated list sles-15-3-sap-ha: ".*sles.*15-3.*amd64.*hana.*" sles-15-4-sap-ha: ".*sles.*15-4.*amd64.*hana.*" sles-15-5-sap-ha: ".*sles.*15-5.*amd64.*hana.*" + sles-15-6-sap-ha: ".*sles.*15-6.*amd64.*hana.*" sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: @@ -483,96 +547,186 @@ sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: #### sap_vm_provision_msazure_vm_host_os_image_dictionary: - + rhel-8-0: + publisher: "RedHat" + offer: "RHEL" + sku: "8-gen2" + rhel-8-1: + publisher: "RedHat" + offer: "RHEL" + sku: "81-gen2" + rhel-8-2: + publisher: "RedHat" + offer: "RHEL" + sku: "82-gen2" + rhel-8-3: + publisher: "RedHat" + offer: "RHEL" + sku: "83-gen2" rhel-8-4: publisher: "RedHat" offer: "RHEL" sku: "84-gen2" - + rhel-8-5: + publisher: "RedHat" + offer: "RHEL" + sku: "85-gen2" + rhel-8-6: + publisher: "RedHat" + offer: "RHEL" + sku: "86-gen2" + rhel-8-7: + publisher: "RedHat" + offer: "RHEL" + sku: "87-gen2" + rhel-8-8: + publisher: "RedHat" + offer: "RHEL" + sku: "88-gen2" + rhel-8-9: + publisher: "RedHat" + offer: "RHEL" + sku: "89-gen2" + rhel-8-10: + publisher: "RedHat" + offer: "RHEL" + sku: "810-gen2" + rhel-9-0: + publisher: "RedHat" + offer: "RHEL" + sku: "90-gen2" + rhel-9-1: + publisher: "RedHat" + offer: "RHEL" + sku: "91-gen2" + rhel-9-2: + publisher: "RedHat" + offer: "RHEL" + sku: "92-gen2" + rhel-9-3: + publisher: "RedHat" + offer: "RHEL" + sku: "93-gen2" + rhel-9-4: + publisher: "RedHat" + offer: "RHEL" + sku: "94-gen2" + sles-12-5: + publisher: "SUSE" + offer: "sles-12-sp5" + sku: "gen2" + sles-15-1: + publisher: "SUSE" + offer: "sles-15-sp1" + sku: "gen2" + sles-15-2: + publisher: "SUSE" + offer: "sles-15-sp2" + sku: "gen2" + sles-15-3: + publisher: "SUSE" + offer: "sles-15-sp3" + sku: "gen2" + sles-15-4: + publisher: "SUSE" + offer: "sles-15-sp4" + sku: "gen2" + sles-15-5: + publisher: "SUSE" + offer: "sles-15-sp5" + sku: "gen2" + sles-15-6: + publisher: "SUSE" + offer: "sles-15-sp6" + sku: "gen2" rhel-8-1-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "81sapha-gen2" - rhel-8-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "82sapha-gen2" - rhel-8-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "84sapha-gen2" - rhel-8-6-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "86sapha-gen2" - rhel-8-8-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "88sapha-gen2" - + rhel-8-10-sap-ha: + publisher: "RedHat" + offer: "RHEL-SAP-HA" + sku: "810sapha-gen2" rhel-9-0-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "90sapha-gen2" - rhel-9-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "92sapha-gen2" - - rhel-8-1-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "81sapapps-gen2" - - rhel-8-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "82sapapps-gen2" - - rhel-8-4-sap-applications: + rhel-9-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" - sku: "84sapapps-gen2" - - rhel-8-6-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "86sapapps-gen2" - - rhel-8-8-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "88sapapps-gen2" - - rhel-9-0-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "90sapapps-gen2" - - rhel-9-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "92sapapps-gen2" - - sles-15-sp3-sap: + sku: "94sapha-gen2" + sles-12-5-sap-ha: + publisher: "SUSE" + offer: "sles-sap-12-sp5" + sku: "gen2" + sles-15-1-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp1" + sku: "gen2" + sles-15-2-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp2" + sku: "gen2" + sles-15-3-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp3" sku: "gen2" - - sles-15-sp4-sap: + sles-15-4-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp4" sku: "gen2" - - sles-15-sp5-sap: + sles-15-5-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp5" sku: "gen2" + sles-15-6-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp6" + sku: "gen2" + sles-15-1-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp1-byos" + sku: "gen2" + sles-15-2-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp2-byos" + sku: "gen2" + sles-15-3-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp3-byos" + sku: "gen2" + sles-15-4-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp4-byos" + sku: "gen2" + sles-15-5-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp5-byos" + sku: "gen2" + sles-15-6-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp6-byos" + sku: "gen2" sap_vm_provision_msazure_vm_host_specifications_dictionary: diff --git a/deploy_scenarios/sap_nwas_abap_sapmaxdb_sandbox/ansible_requirements.yml b/deploy_scenarios/sap_nwas_abap_sapmaxdb_sandbox/ansible_requirements.yml index af7ed22..1454ec5 100644 --- a/deploy_scenarios/sap_nwas_abap_sapmaxdb_sandbox/ansible_requirements.yml +++ b/deploy_scenarios/sap_nwas_abap_sapmaxdb_sandbox/ansible_requirements.yml @@ -8,16 +8,16 @@ collections: version: 6.1.0 - name: fedora.linux_system_roles type: galaxy - version: 1.82.0 + version: 1.88.9 - name: community.sap_install type: galaxy - version: 1.4.0 + version: 1.5.0 - name: community.sap_launchpad type: galaxy - version: 1.1.0 + version: 1.1.1 - name: community.sap_infrastructure type: galaxy - version: 1.0.1 + version: 1.1.0 # - name: community.sap_operations # type: galaxy # version: 0.9.1 @@ -25,23 +25,23 @@ collections: # Collections for Infrastructure from Ansible Galaxy - name: cloud.terraform type: galaxy - version: 1.1.0 + version: 3.0.0 - name: amazon.aws type: galaxy - version: 7.2.0 + version: 9.0.0 - name: community.aws type: galaxy - version: 7.1.0 + version: 9.0.0 - name: azure.azcollection type: galaxy - version: 2.2.0 + version: 3.0.1 - name: google.cloud type: galaxy version: 1.1.3 # Replace with ibm.cloud in future, legacy Ansible Collection uses hidden on-the-fly Terraform files in /var/tmp/ansible/ibmcloud) - name: ibm.cloudcollection type: galaxy - version: 1.51.0 + version: 1.71.2 - name: ovirt.ovirt type: galaxy version: 3.1.2 @@ -53,21 +53,12 @@ collections: version: 3.0.0 - name: cloud.common type: galaxy - version: 3.0.0 + version: 4.0.0 # Collections from public repositories via HTTPS # - name: https://github.com/sap-linuxlab/community.sap_install.git # type: git # version: dev -# - name: https://github.com/sap-linuxlab/community.sap_launchpad.git -# type: git -# version: main -# - name: https://github.com/sap-linuxlab/community.sap_operations.git -# type: git -# version: main -# - name: https://github.com/ansible-collections/cloud.terraform.git -# type: git -# version: main # Collections from private repositories via use SSH (embedded GitHub PAT does not work) # Used for customised/forked Ansible Collections diff --git a/deploy_scenarios/sap_nwas_abap_sapmaxdb_sandbox/optional/ansible_extravars_noninteractive.yml b/deploy_scenarios/sap_nwas_abap_sapmaxdb_sandbox/optional/ansible_extravars_noninteractive.yml index 412f843..7bfb31e 100755 --- a/deploy_scenarios/sap_nwas_abap_sapmaxdb_sandbox/optional/ansible_extravars_noninteractive.yml +++ b/deploy_scenarios/sap_nwas_abap_sapmaxdb_sandbox/optional/ansible_extravars_noninteractive.yml @@ -270,7 +270,7 @@ sap_id_user: "ENTER_STRING_VALUE_HERE" sap_id_user_password: 'ENTER_STRING_VALUE_HERE' # Directory for SAP installation media -sap_software_download_directory: "ENTER_STRING_VALUE_HERE" +sap_install_media_detect_source_directory: "ENTER_STRING_VALUE_HERE" # e.g. /software #### diff --git a/deploy_scenarios/sap_nwas_java_ibmdb2_sandbox/ansible_extravars.yml b/deploy_scenarios/sap_nwas_java_ibmdb2_sandbox/ansible_extravars.yml index b8f6cc3..a1890fb 100755 --- a/deploy_scenarios/sap_nwas_java_ibmdb2_sandbox/ansible_extravars.yml +++ b/deploy_scenarios/sap_nwas_java_ibmdb2_sandbox/ansible_extravars.yml @@ -157,27 +157,43 @@ sap_swpm_templates_install_dictionary: sap_vm_provision_aws_ec2_vs_host_os_image_dictionary: rhel-8-1: "*RHEL-8.1*_HVM*x86_64*" - rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" + # rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" # removed rhel-8-4: "*RHEL-8.4*_HVM*x86_64*" rhel-8-6: "*RHEL-8.6*_HVM*x86_64*" rhel-8-8: "*RHEL-8.8*_HVM*x86_64*" + rhel-8-10: "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0: "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1: "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2: "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3: "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4: "*RHEL-9.4*_HVM*x86_64*" + sles-12-5: "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" # removed + # sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" # removed + # sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" # removed + sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6: "*suse-sles-15-sp6-v202*-hvm-ssd-x86_64*" + # rhel-7-7-sap-ha: "*RHEL-SAP-8.1.0*" # removed + # rhel-7-9-sap-ha: "*RHEL-SAP-8.1.0*" # removed rhel-8-1-sap-ha: "*RHEL-SAP-8.1.0*" rhel-8-2-sap-ha: "*RHEL-SAP-8.2.0*" rhel-8-4-sap-ha: "*RHEL-SAP-8.4.0*" rhel-8-6-sap-ha: "*RHEL-SAP-8.6.0*" rhel-8-8-sap-ha: "*RHEL-SAP-8.8.0*" + rhel-8-10-sap-ha: "*RHEL-SAP-8.10.0*" rhel-9-0-sap-ha: "*RHEL-SAP-9.0.0*" rhel-9-2-sap-ha: "*RHEL-SAP-9.2.0*" - sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" - sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" - sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" - sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + rhel-9-4-sap-ha: "*RHEL-SAP-9.4.0*" sles-12-5-sap-ha: "*suse-sles-sap-12-sp5-v202*-hvm-ssd-x86_64*" sles-15-1-sap-ha: "*suse-sles-sap-15-sp1-v202*-hvm-ssd-x86_64*" sles-15-2-sap-ha: "*suse-sles-sap-15-sp2-v202*-hvm-ssd-x86_64*" sles-15-3-sap-ha: "*suse-sles-sap-15-sp3-v202*-hvm-ssd-x86_64*" sles-15-4-sap-ha: "*suse-sles-sap-15-sp4-v202*-hvm-ssd-x86_64*" sles-15-5-sap-ha: "*suse-sles-sap-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha: "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" + sles-15-4-sap-ha-byos: "*suse-sles-sap-15-sp4-byos-v202*-hvm-ssd-x86_64*" + sles-15-5-sap-ha-byos: "*suse-sles-sap-15-sp5-byos-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha-byos: "*suse-sles-sap-15-sp6-byos-v202*-hvm-ssd-x86_64*" sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: @@ -245,42 +261,75 @@ sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: #### sap_vm_provision_gcp_ce_vm_host_os_image_dictionary: - rhel-8-latest: project: "rhel-cloud" family: "rhel-8" - - rhel-8-1-sap-ha: + rhel-9-latest: + project: "rhel-cloud" + family: "rhel-9" + sles-12-latest: + project: "suse-cloud" + family: "sles-12" + sles-15-latest: + project: "suse-cloud" + family: "sles-15" + # rhel-7-7-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-7-7-sap-ha" + rhel-7-9-sap-ha: project: "rhel-sap-cloud" - family: "rhel-8-1-sap-ha" - + family: "rhel-7-9-sap-ha" + # rhel-8-1-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-8-1-sap-ha" rhel-8-2-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-2-sap-ha" - rhel-8-4-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-4-sap-ha" - rhel-8-6-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-6-sap-ha" - - sles-15-latest: - project: "suse-cloud" - family: "sles-15" - - sles-15-sp3-sap: + sles-12-5-sap-ha: + project: "suse-sap-cloud" + family: "sles-12-sp5-sap" + # sles-15-1-sap-ha: # removed + # project: "suse-sap-cloud" + # family: "sles-15-sp1-sap" + sles-15-2-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp2-sap" + sles-15-3-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp3-sap" - - sles-15-sp4-sap: + sles-15-4-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp4-sap" - - sles-15-sp5-sap: + sles-15-5-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp5-sap" + sles-15-6-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp6-sap" + sles-12-5-sap-ha-byos: + project: "suse-byos-cloud" + family: "sles-12-sp5-sap-byos" + sles-15-2-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp2-sap-byos" + sles-15-3-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp3-sap-byos" + sles-15-4-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp4-sap-byos" + sles-15-5-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp5-sap-byos" + sles-15-6-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp6-sap-byos" sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: @@ -355,16 +404,31 @@ sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: sap_vm_provision_ibmcloud_vs_host_os_image_dictionary: rhel-8-4: ".*redhat.*8-4.*minimal.*amd64.*" rhel-8-6: ".*redhat.*8-6.*minimal.*amd64.*" + rhel-8-8: ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10: ".*redhat.*8-10.*minimal.*amd64.*" rhel-9-0: ".*redhat.*9-0.*minimal.*amd64.*" rhel-9-2: ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4: ".*redhat.*9-4.*minimal.*amd64.*" + sles-15-5: ".*sles.*15-5.*amd64-[0-9]" + sles-15-6: ".*sles.*15-6.*amd64-[0-9]" + # rhel-7-6-sap-ha: ".*redhat.*7-6.*amd64.*hana.*" # retrievable from deprecated list + # rhel-7-9-sap-ha: ".*redhat.*7-9.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-1-sap-ha: ".*redhat.*8-1.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-2-sap-ha: ".*redhat.*8-2.*amd64.*hana.*" # retrievable from deprecated list rhel-8-4-sap-ha: ".*redhat.*8-4.*amd64.*hana.*" rhel-8-6-sap-ha: ".*redhat.*8-6.*amd64.*hana.*" rhel-8-8-sap-ha: ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha: ".*redhat.*8-10.*amd64.*hana.*" rhel-9-0-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" - rhel-9-2-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha: ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha: ".*redhat.*9-4.*amd64.*hana.*" + # sles-12-4-sap-ha: ".*sles.*12-4.*amd64.*hana.*" # retrievable from deprecated list + # sles-12-5-sap-ha: ".*sles.*12-5.*amd64.*hana.*" # retrievable from deprecated list + # sles-15-1-sap-ha: ".*sles.*15-1.*amd64.*hana.*" # retrievable from deprecated list sles-15-3-sap-ha: ".*sles.*15-3.*amd64.*hana.*" sles-15-4-sap-ha: ".*sles.*15-4.*amd64.*hana.*" sles-15-5-sap-ha: ".*sles.*15-5.*amd64.*hana.*" + sles-15-6-sap-ha: ".*sles.*15-6.*amd64.*hana.*" sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: @@ -437,96 +501,186 @@ sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: #### sap_vm_provision_msazure_vm_host_os_image_dictionary: - + rhel-8-0: + publisher: "RedHat" + offer: "RHEL" + sku: "8-gen2" + rhel-8-1: + publisher: "RedHat" + offer: "RHEL" + sku: "81-gen2" + rhel-8-2: + publisher: "RedHat" + offer: "RHEL" + sku: "82-gen2" + rhel-8-3: + publisher: "RedHat" + offer: "RHEL" + sku: "83-gen2" rhel-8-4: publisher: "RedHat" offer: "RHEL" sku: "84-gen2" - + rhel-8-5: + publisher: "RedHat" + offer: "RHEL" + sku: "85-gen2" + rhel-8-6: + publisher: "RedHat" + offer: "RHEL" + sku: "86-gen2" + rhel-8-7: + publisher: "RedHat" + offer: "RHEL" + sku: "87-gen2" + rhel-8-8: + publisher: "RedHat" + offer: "RHEL" + sku: "88-gen2" + rhel-8-9: + publisher: "RedHat" + offer: "RHEL" + sku: "89-gen2" + rhel-8-10: + publisher: "RedHat" + offer: "RHEL" + sku: "810-gen2" + rhel-9-0: + publisher: "RedHat" + offer: "RHEL" + sku: "90-gen2" + rhel-9-1: + publisher: "RedHat" + offer: "RHEL" + sku: "91-gen2" + rhel-9-2: + publisher: "RedHat" + offer: "RHEL" + sku: "92-gen2" + rhel-9-3: + publisher: "RedHat" + offer: "RHEL" + sku: "93-gen2" + rhel-9-4: + publisher: "RedHat" + offer: "RHEL" + sku: "94-gen2" + sles-12-5: + publisher: "SUSE" + offer: "sles-12-sp5" + sku: "gen2" + sles-15-1: + publisher: "SUSE" + offer: "sles-15-sp1" + sku: "gen2" + sles-15-2: + publisher: "SUSE" + offer: "sles-15-sp2" + sku: "gen2" + sles-15-3: + publisher: "SUSE" + offer: "sles-15-sp3" + sku: "gen2" + sles-15-4: + publisher: "SUSE" + offer: "sles-15-sp4" + sku: "gen2" + sles-15-5: + publisher: "SUSE" + offer: "sles-15-sp5" + sku: "gen2" + sles-15-6: + publisher: "SUSE" + offer: "sles-15-sp6" + sku: "gen2" rhel-8-1-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "81sapha-gen2" - rhel-8-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "82sapha-gen2" - rhel-8-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "84sapha-gen2" - rhel-8-6-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "86sapha-gen2" - rhel-8-8-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "88sapha-gen2" - + rhel-8-10-sap-ha: + publisher: "RedHat" + offer: "RHEL-SAP-HA" + sku: "810sapha-gen2" rhel-9-0-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "90sapha-gen2" - rhel-9-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "92sapha-gen2" - - rhel-8-1-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "81sapapps-gen2" - - rhel-8-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "82sapapps-gen2" - - rhel-8-4-sap-applications: + rhel-9-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" - sku: "84sapapps-gen2" - - rhel-8-6-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "86sapapps-gen2" - - rhel-8-8-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "88sapapps-gen2" - - rhel-9-0-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "90sapapps-gen2" - - rhel-9-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "92sapapps-gen2" - - sles-15-sp3-sap: + sku: "94sapha-gen2" + sles-12-5-sap-ha: + publisher: "SUSE" + offer: "sles-sap-12-sp5" + sku: "gen2" + sles-15-1-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp1" + sku: "gen2" + sles-15-2-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp2" + sku: "gen2" + sles-15-3-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp3" sku: "gen2" - - sles-15-sp4-sap: + sles-15-4-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp4" sku: "gen2" - - sles-15-sp5-sap: + sles-15-5-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp5" sku: "gen2" + sles-15-6-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp6" + sku: "gen2" + sles-15-1-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp1-byos" + sku: "gen2" + sles-15-2-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp2-byos" + sku: "gen2" + sles-15-3-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp3-byos" + sku: "gen2" + sles-15-4-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp4-byos" + sku: "gen2" + sles-15-5-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp5-byos" + sku: "gen2" + sles-15-6-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp6-byos" + sku: "gen2" sap_vm_provision_msazure_vm_host_specifications_dictionary: diff --git a/deploy_scenarios/sap_nwas_java_ibmdb2_sandbox/ansible_requirements.yml b/deploy_scenarios/sap_nwas_java_ibmdb2_sandbox/ansible_requirements.yml index af7ed22..1454ec5 100644 --- a/deploy_scenarios/sap_nwas_java_ibmdb2_sandbox/ansible_requirements.yml +++ b/deploy_scenarios/sap_nwas_java_ibmdb2_sandbox/ansible_requirements.yml @@ -8,16 +8,16 @@ collections: version: 6.1.0 - name: fedora.linux_system_roles type: galaxy - version: 1.82.0 + version: 1.88.9 - name: community.sap_install type: galaxy - version: 1.4.0 + version: 1.5.0 - name: community.sap_launchpad type: galaxy - version: 1.1.0 + version: 1.1.1 - name: community.sap_infrastructure type: galaxy - version: 1.0.1 + version: 1.1.0 # - name: community.sap_operations # type: galaxy # version: 0.9.1 @@ -25,23 +25,23 @@ collections: # Collections for Infrastructure from Ansible Galaxy - name: cloud.terraform type: galaxy - version: 1.1.0 + version: 3.0.0 - name: amazon.aws type: galaxy - version: 7.2.0 + version: 9.0.0 - name: community.aws type: galaxy - version: 7.1.0 + version: 9.0.0 - name: azure.azcollection type: galaxy - version: 2.2.0 + version: 3.0.1 - name: google.cloud type: galaxy version: 1.1.3 # Replace with ibm.cloud in future, legacy Ansible Collection uses hidden on-the-fly Terraform files in /var/tmp/ansible/ibmcloud) - name: ibm.cloudcollection type: galaxy - version: 1.51.0 + version: 1.71.2 - name: ovirt.ovirt type: galaxy version: 3.1.2 @@ -53,21 +53,12 @@ collections: version: 3.0.0 - name: cloud.common type: galaxy - version: 3.0.0 + version: 4.0.0 # Collections from public repositories via HTTPS # - name: https://github.com/sap-linuxlab/community.sap_install.git # type: git # version: dev -# - name: https://github.com/sap-linuxlab/community.sap_launchpad.git -# type: git -# version: main -# - name: https://github.com/sap-linuxlab/community.sap_operations.git -# type: git -# version: main -# - name: https://github.com/ansible-collections/cloud.terraform.git -# type: git -# version: main # Collections from private repositories via use SSH (embedded GitHub PAT does not work) # Used for customised/forked Ansible Collections diff --git a/deploy_scenarios/sap_nwas_java_ibmdb2_sandbox/optional/ansible_extravars_noninteractive.yml b/deploy_scenarios/sap_nwas_java_ibmdb2_sandbox/optional/ansible_extravars_noninteractive.yml index 0dcdd27..cefe177 100755 --- a/deploy_scenarios/sap_nwas_java_ibmdb2_sandbox/optional/ansible_extravars_noninteractive.yml +++ b/deploy_scenarios/sap_nwas_java_ibmdb2_sandbox/optional/ansible_extravars_noninteractive.yml @@ -270,7 +270,7 @@ sap_id_user: "ENTER_STRING_VALUE_HERE" sap_id_user_password: 'ENTER_STRING_VALUE_HERE' # Directory for SAP installation media -sap_software_download_directory: "ENTER_STRING_VALUE_HERE" +sap_install_media_detect_source_directory: "ENTER_STRING_VALUE_HERE" # e.g. /software #### # SAP SWPM, uses the Ansible Role sap_swpm with Default Templates mode diff --git a/deploy_scenarios/sap_nwas_java_sapase_sandbox/ansible_extravars.yml b/deploy_scenarios/sap_nwas_java_sapase_sandbox/ansible_extravars.yml index f7cb299..8f8fb1a 100755 --- a/deploy_scenarios/sap_nwas_java_sapase_sandbox/ansible_extravars.yml +++ b/deploy_scenarios/sap_nwas_java_sapase_sandbox/ansible_extravars.yml @@ -142,7 +142,7 @@ sap_swpm_templates_install_dictionary: - 'SAPHOSTAGENT61_61-80004822.SAR' # SAP Host Agent 7.22 - 'SAPJVM8_90-80000202.SAR' # SAP JVM 8.1 - '51055106' # SAP Netweaver 7.5 SP22 Java, ZIP. Contains JAVA_EXPORT (SAP:JEXPORT:750:SP22:*:*), JAVA_EXPORT_JDMP (SAP:JDMP:750:SP22:*:SW-LABEL), JAVA_J2EE_OSINDEP (SAP:J2EE-CD:750:J2EE-CD:j2ee-cd:*), JAVA_J2EE_OSINDEP_J2EE_INST (SAP:J2EE-INST:750:SP22:*:*), JAVA_J2EE_OSINDEP_UT (SAP:UT:750:SP22:*:*) - - '51057804_1' # SAP ASE 16.0.04.06 RDBMS Linux on x86_64 64bit + - '51057961_1' # SAP ASE 16.0.04.06 HF1 RDBMS Linux on x86_64 64bit - 'ASEBC16004P_5-20012477.SAR' # SAP ASE 16.0 SP04 (160-04) FOR BUS. SUITE DBCLIENT with Patch (P_*) softwarecenter_search_list_ppc64le: @@ -156,27 +156,43 @@ sap_swpm_templates_install_dictionary: sap_vm_provision_aws_ec2_vs_host_os_image_dictionary: rhel-8-1: "*RHEL-8.1*_HVM*x86_64*" - rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" + # rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" # removed rhel-8-4: "*RHEL-8.4*_HVM*x86_64*" rhel-8-6: "*RHEL-8.6*_HVM*x86_64*" rhel-8-8: "*RHEL-8.8*_HVM*x86_64*" + rhel-8-10: "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0: "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1: "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2: "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3: "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4: "*RHEL-9.4*_HVM*x86_64*" + sles-12-5: "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" # removed + # sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" # removed + # sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" # removed + sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6: "*suse-sles-15-sp6-v202*-hvm-ssd-x86_64*" + # rhel-7-7-sap-ha: "*RHEL-SAP-8.1.0*" # removed + # rhel-7-9-sap-ha: "*RHEL-SAP-8.1.0*" # removed rhel-8-1-sap-ha: "*RHEL-SAP-8.1.0*" rhel-8-2-sap-ha: "*RHEL-SAP-8.2.0*" rhel-8-4-sap-ha: "*RHEL-SAP-8.4.0*" rhel-8-6-sap-ha: "*RHEL-SAP-8.6.0*" rhel-8-8-sap-ha: "*RHEL-SAP-8.8.0*" + rhel-8-10-sap-ha: "*RHEL-SAP-8.10.0*" rhel-9-0-sap-ha: "*RHEL-SAP-9.0.0*" rhel-9-2-sap-ha: "*RHEL-SAP-9.2.0*" - sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" - sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" - sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" - sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + rhel-9-4-sap-ha: "*RHEL-SAP-9.4.0*" sles-12-5-sap-ha: "*suse-sles-sap-12-sp5-v202*-hvm-ssd-x86_64*" sles-15-1-sap-ha: "*suse-sles-sap-15-sp1-v202*-hvm-ssd-x86_64*" sles-15-2-sap-ha: "*suse-sles-sap-15-sp2-v202*-hvm-ssd-x86_64*" sles-15-3-sap-ha: "*suse-sles-sap-15-sp3-v202*-hvm-ssd-x86_64*" sles-15-4-sap-ha: "*suse-sles-sap-15-sp4-v202*-hvm-ssd-x86_64*" sles-15-5-sap-ha: "*suse-sles-sap-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha: "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" + sles-15-4-sap-ha-byos: "*suse-sles-sap-15-sp4-byos-v202*-hvm-ssd-x86_64*" + sles-15-5-sap-ha-byos: "*suse-sles-sap-15-sp5-byos-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha-byos: "*suse-sles-sap-15-sp6-byos-v202*-hvm-ssd-x86_64*" sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: @@ -244,42 +260,75 @@ sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: #### sap_vm_provision_gcp_ce_vm_host_os_image_dictionary: - rhel-8-latest: project: "rhel-cloud" family: "rhel-8" - - rhel-8-1-sap-ha: + rhel-9-latest: + project: "rhel-cloud" + family: "rhel-9" + sles-12-latest: + project: "suse-cloud" + family: "sles-12" + sles-15-latest: + project: "suse-cloud" + family: "sles-15" + # rhel-7-7-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-7-7-sap-ha" + rhel-7-9-sap-ha: project: "rhel-sap-cloud" - family: "rhel-8-1-sap-ha" - + family: "rhel-7-9-sap-ha" + # rhel-8-1-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-8-1-sap-ha" rhel-8-2-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-2-sap-ha" - rhel-8-4-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-4-sap-ha" - rhel-8-6-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-6-sap-ha" - - sles-15-latest: - project: "suse-cloud" - family: "sles-15" - - sles-15-sp3-sap: + sles-12-5-sap-ha: + project: "suse-sap-cloud" + family: "sles-12-sp5-sap" + # sles-15-1-sap-ha: # removed + # project: "suse-sap-cloud" + # family: "sles-15-sp1-sap" + sles-15-2-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp2-sap" + sles-15-3-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp3-sap" - - sles-15-sp4-sap: + sles-15-4-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp4-sap" - - sles-15-sp5-sap: + sles-15-5-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp5-sap" + sles-15-6-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp6-sap" + sles-12-5-sap-ha-byos: + project: "suse-byos-cloud" + family: "sles-12-sp5-sap-byos" + sles-15-2-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp2-sap-byos" + sles-15-3-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp3-sap-byos" + sles-15-4-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp4-sap-byos" + sles-15-5-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp5-sap-byos" + sles-15-6-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp6-sap-byos" sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: @@ -354,16 +403,31 @@ sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: sap_vm_provision_ibmcloud_vs_host_os_image_dictionary: rhel-8-4: ".*redhat.*8-4.*minimal.*amd64.*" rhel-8-6: ".*redhat.*8-6.*minimal.*amd64.*" + rhel-8-8: ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10: ".*redhat.*8-10.*minimal.*amd64.*" rhel-9-0: ".*redhat.*9-0.*minimal.*amd64.*" rhel-9-2: ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4: ".*redhat.*9-4.*minimal.*amd64.*" + sles-15-5: ".*sles.*15-5.*amd64-[0-9]" + sles-15-6: ".*sles.*15-6.*amd64-[0-9]" + # rhel-7-6-sap-ha: ".*redhat.*7-6.*amd64.*hana.*" # retrievable from deprecated list + # rhel-7-9-sap-ha: ".*redhat.*7-9.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-1-sap-ha: ".*redhat.*8-1.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-2-sap-ha: ".*redhat.*8-2.*amd64.*hana.*" # retrievable from deprecated list rhel-8-4-sap-ha: ".*redhat.*8-4.*amd64.*hana.*" rhel-8-6-sap-ha: ".*redhat.*8-6.*amd64.*hana.*" rhel-8-8-sap-ha: ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha: ".*redhat.*8-10.*amd64.*hana.*" rhel-9-0-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" - rhel-9-2-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha: ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha: ".*redhat.*9-4.*amd64.*hana.*" + # sles-12-4-sap-ha: ".*sles.*12-4.*amd64.*hana.*" # retrievable from deprecated list + # sles-12-5-sap-ha: ".*sles.*12-5.*amd64.*hana.*" # retrievable from deprecated list + # sles-15-1-sap-ha: ".*sles.*15-1.*amd64.*hana.*" # retrievable from deprecated list sles-15-3-sap-ha: ".*sles.*15-3.*amd64.*hana.*" sles-15-4-sap-ha: ".*sles.*15-4.*amd64.*hana.*" sles-15-5-sap-ha: ".*sles.*15-5.*amd64.*hana.*" + sles-15-6-sap-ha: ".*sles.*15-6.*amd64.*hana.*" sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: @@ -436,96 +500,186 @@ sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: #### sap_vm_provision_msazure_vm_host_os_image_dictionary: - + rhel-8-0: + publisher: "RedHat" + offer: "RHEL" + sku: "8-gen2" + rhel-8-1: + publisher: "RedHat" + offer: "RHEL" + sku: "81-gen2" + rhel-8-2: + publisher: "RedHat" + offer: "RHEL" + sku: "82-gen2" + rhel-8-3: + publisher: "RedHat" + offer: "RHEL" + sku: "83-gen2" rhel-8-4: publisher: "RedHat" offer: "RHEL" sku: "84-gen2" - + rhel-8-5: + publisher: "RedHat" + offer: "RHEL" + sku: "85-gen2" + rhel-8-6: + publisher: "RedHat" + offer: "RHEL" + sku: "86-gen2" + rhel-8-7: + publisher: "RedHat" + offer: "RHEL" + sku: "87-gen2" + rhel-8-8: + publisher: "RedHat" + offer: "RHEL" + sku: "88-gen2" + rhel-8-9: + publisher: "RedHat" + offer: "RHEL" + sku: "89-gen2" + rhel-8-10: + publisher: "RedHat" + offer: "RHEL" + sku: "810-gen2" + rhel-9-0: + publisher: "RedHat" + offer: "RHEL" + sku: "90-gen2" + rhel-9-1: + publisher: "RedHat" + offer: "RHEL" + sku: "91-gen2" + rhel-9-2: + publisher: "RedHat" + offer: "RHEL" + sku: "92-gen2" + rhel-9-3: + publisher: "RedHat" + offer: "RHEL" + sku: "93-gen2" + rhel-9-4: + publisher: "RedHat" + offer: "RHEL" + sku: "94-gen2" + sles-12-5: + publisher: "SUSE" + offer: "sles-12-sp5" + sku: "gen2" + sles-15-1: + publisher: "SUSE" + offer: "sles-15-sp1" + sku: "gen2" + sles-15-2: + publisher: "SUSE" + offer: "sles-15-sp2" + sku: "gen2" + sles-15-3: + publisher: "SUSE" + offer: "sles-15-sp3" + sku: "gen2" + sles-15-4: + publisher: "SUSE" + offer: "sles-15-sp4" + sku: "gen2" + sles-15-5: + publisher: "SUSE" + offer: "sles-15-sp5" + sku: "gen2" + sles-15-6: + publisher: "SUSE" + offer: "sles-15-sp6" + sku: "gen2" rhel-8-1-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "81sapha-gen2" - rhel-8-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "82sapha-gen2" - rhel-8-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "84sapha-gen2" - rhel-8-6-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "86sapha-gen2" - rhel-8-8-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "88sapha-gen2" - + rhel-8-10-sap-ha: + publisher: "RedHat" + offer: "RHEL-SAP-HA" + sku: "810sapha-gen2" rhel-9-0-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "90sapha-gen2" - rhel-9-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "92sapha-gen2" - - rhel-8-1-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "81sapapps-gen2" - - rhel-8-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "82sapapps-gen2" - - rhel-8-4-sap-applications: + rhel-9-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" - sku: "84sapapps-gen2" - - rhel-8-6-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "86sapapps-gen2" - - rhel-8-8-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "88sapapps-gen2" - - rhel-9-0-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "90sapapps-gen2" - - rhel-9-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "92sapapps-gen2" - - sles-15-sp3-sap: + sku: "94sapha-gen2" + sles-12-5-sap-ha: + publisher: "SUSE" + offer: "sles-sap-12-sp5" + sku: "gen2" + sles-15-1-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp1" + sku: "gen2" + sles-15-2-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp2" + sku: "gen2" + sles-15-3-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp3" sku: "gen2" - - sles-15-sp4-sap: + sles-15-4-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp4" sku: "gen2" - - sles-15-sp5-sap: + sles-15-5-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp5" sku: "gen2" + sles-15-6-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp6" + sku: "gen2" + sles-15-1-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp1-byos" + sku: "gen2" + sles-15-2-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp2-byos" + sku: "gen2" + sles-15-3-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp3-byos" + sku: "gen2" + sles-15-4-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp4-byos" + sku: "gen2" + sles-15-5-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp5-byos" + sku: "gen2" + sles-15-6-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp6-byos" + sku: "gen2" sap_vm_provision_msazure_vm_host_specifications_dictionary: diff --git a/deploy_scenarios/sap_nwas_java_sapase_sandbox/ansible_requirements.yml b/deploy_scenarios/sap_nwas_java_sapase_sandbox/ansible_requirements.yml index af7ed22..1454ec5 100644 --- a/deploy_scenarios/sap_nwas_java_sapase_sandbox/ansible_requirements.yml +++ b/deploy_scenarios/sap_nwas_java_sapase_sandbox/ansible_requirements.yml @@ -8,16 +8,16 @@ collections: version: 6.1.0 - name: fedora.linux_system_roles type: galaxy - version: 1.82.0 + version: 1.88.9 - name: community.sap_install type: galaxy - version: 1.4.0 + version: 1.5.0 - name: community.sap_launchpad type: galaxy - version: 1.1.0 + version: 1.1.1 - name: community.sap_infrastructure type: galaxy - version: 1.0.1 + version: 1.1.0 # - name: community.sap_operations # type: galaxy # version: 0.9.1 @@ -25,23 +25,23 @@ collections: # Collections for Infrastructure from Ansible Galaxy - name: cloud.terraform type: galaxy - version: 1.1.0 + version: 3.0.0 - name: amazon.aws type: galaxy - version: 7.2.0 + version: 9.0.0 - name: community.aws type: galaxy - version: 7.1.0 + version: 9.0.0 - name: azure.azcollection type: galaxy - version: 2.2.0 + version: 3.0.1 - name: google.cloud type: galaxy version: 1.1.3 # Replace with ibm.cloud in future, legacy Ansible Collection uses hidden on-the-fly Terraform files in /var/tmp/ansible/ibmcloud) - name: ibm.cloudcollection type: galaxy - version: 1.51.0 + version: 1.71.2 - name: ovirt.ovirt type: galaxy version: 3.1.2 @@ -53,21 +53,12 @@ collections: version: 3.0.0 - name: cloud.common type: galaxy - version: 3.0.0 + version: 4.0.0 # Collections from public repositories via HTTPS # - name: https://github.com/sap-linuxlab/community.sap_install.git # type: git # version: dev -# - name: https://github.com/sap-linuxlab/community.sap_launchpad.git -# type: git -# version: main -# - name: https://github.com/sap-linuxlab/community.sap_operations.git -# type: git -# version: main -# - name: https://github.com/ansible-collections/cloud.terraform.git -# type: git -# version: main # Collections from private repositories via use SSH (embedded GitHub PAT does not work) # Used for customised/forked Ansible Collections diff --git a/deploy_scenarios/sap_nwas_java_sapase_sandbox/optional/ansible_extravars_noninteractive.yml b/deploy_scenarios/sap_nwas_java_sapase_sandbox/optional/ansible_extravars_noninteractive.yml index dc93533..2b1eaa4 100755 --- a/deploy_scenarios/sap_nwas_java_sapase_sandbox/optional/ansible_extravars_noninteractive.yml +++ b/deploy_scenarios/sap_nwas_java_sapase_sandbox/optional/ansible_extravars_noninteractive.yml @@ -270,7 +270,7 @@ sap_id_user: "ENTER_STRING_VALUE_HERE" sap_id_user_password: 'ENTER_STRING_VALUE_HERE' # Directory for SAP installation media -sap_software_download_directory: "ENTER_STRING_VALUE_HERE" +sap_install_media_detect_source_directory: "ENTER_STRING_VALUE_HERE" # e.g. /software #### diff --git a/deploy_scenarios/sap_s4hana_distributed/ansible_extravars.yml b/deploy_scenarios/sap_s4hana_distributed/ansible_extravars.yml index 52500e4..84ef67e 100755 --- a/deploy_scenarios/sap_s4hana_distributed/ansible_extravars.yml +++ b/deploy_scenarios/sap_s4hana_distributed/ansible_extravars.yml @@ -1583,27 +1583,43 @@ sap_swpm_templates_install_dictionary: sap_vm_provision_aws_ec2_vs_host_os_image_dictionary: rhel-8-1: "*RHEL-8.1*_HVM*x86_64*" - rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" + # rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" # removed rhel-8-4: "*RHEL-8.4*_HVM*x86_64*" rhel-8-6: "*RHEL-8.6*_HVM*x86_64*" rhel-8-8: "*RHEL-8.8*_HVM*x86_64*" + rhel-8-10: "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0: "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1: "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2: "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3: "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4: "*RHEL-9.4*_HVM*x86_64*" + sles-12-5: "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" # removed + # sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" # removed + # sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" # removed + sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6: "*suse-sles-15-sp6-v202*-hvm-ssd-x86_64*" + # rhel-7-7-sap-ha: "*RHEL-SAP-8.1.0*" # removed + # rhel-7-9-sap-ha: "*RHEL-SAP-8.1.0*" # removed rhel-8-1-sap-ha: "*RHEL-SAP-8.1.0*" rhel-8-2-sap-ha: "*RHEL-SAP-8.2.0*" rhel-8-4-sap-ha: "*RHEL-SAP-8.4.0*" rhel-8-6-sap-ha: "*RHEL-SAP-8.6.0*" rhel-8-8-sap-ha: "*RHEL-SAP-8.8.0*" + rhel-8-10-sap-ha: "*RHEL-SAP-8.10.0*" rhel-9-0-sap-ha: "*RHEL-SAP-9.0.0*" rhel-9-2-sap-ha: "*RHEL-SAP-9.2.0*" - sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" - sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" - sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" - sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + rhel-9-4-sap-ha: "*RHEL-SAP-9.4.0*" sles-12-5-sap-ha: "*suse-sles-sap-12-sp5-v202*-hvm-ssd-x86_64*" sles-15-1-sap-ha: "*suse-sles-sap-15-sp1-v202*-hvm-ssd-x86_64*" sles-15-2-sap-ha: "*suse-sles-sap-15-sp2-v202*-hvm-ssd-x86_64*" sles-15-3-sap-ha: "*suse-sles-sap-15-sp3-v202*-hvm-ssd-x86_64*" sles-15-4-sap-ha: "*suse-sles-sap-15-sp4-v202*-hvm-ssd-x86_64*" sles-15-5-sap-ha: "*suse-sles-sap-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha: "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" + sles-15-4-sap-ha-byos: "*suse-sles-sap-15-sp4-byos-v202*-hvm-ssd-x86_64*" + sles-15-5-sap-ha-byos: "*suse-sles-sap-15-sp5-byos-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha-byos: "*suse-sles-sap-15-sp6-byos-v202*-hvm-ssd-x86_64*" sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: @@ -1810,42 +1826,75 @@ sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: #### sap_vm_provision_gcp_ce_vm_host_os_image_dictionary: - rhel-8-latest: project: "rhel-cloud" family: "rhel-8" - - rhel-8-1-sap-ha: + rhel-9-latest: + project: "rhel-cloud" + family: "rhel-9" + sles-12-latest: + project: "suse-cloud" + family: "sles-12" + sles-15-latest: + project: "suse-cloud" + family: "sles-15" + # rhel-7-7-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-7-7-sap-ha" + rhel-7-9-sap-ha: project: "rhel-sap-cloud" - family: "rhel-8-1-sap-ha" - + family: "rhel-7-9-sap-ha" + # rhel-8-1-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-8-1-sap-ha" rhel-8-2-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-2-sap-ha" - rhel-8-4-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-4-sap-ha" - rhel-8-6-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-6-sap-ha" - - sles-15-latest: - project: "suse-cloud" - family: "sles-15" - - sles-15-sp3-sap: + sles-12-5-sap-ha: + project: "suse-sap-cloud" + family: "sles-12-sp5-sap" + # sles-15-1-sap-ha: # removed + # project: "suse-sap-cloud" + # family: "sles-15-sp1-sap" + sles-15-2-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp2-sap" + sles-15-3-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp3-sap" - - sles-15-sp4-sap: + sles-15-4-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp4-sap" - - sles-15-sp5-sap: + sles-15-5-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp5-sap" + sles-15-6-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp6-sap" + sles-12-5-sap-ha-byos: + project: "suse-byos-cloud" + family: "sles-12-sp5-sap-byos" + sles-15-2-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp2-sap-byos" + sles-15-3-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp3-sap-byos" + sles-15-4-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp4-sap-byos" + sles-15-5-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp5-sap-byos" + sles-15-6-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp6-sap-byos" sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: @@ -2058,16 +2107,31 @@ sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: sap_vm_provision_ibmcloud_vs_host_os_image_dictionary: rhel-8-4: ".*redhat.*8-4.*minimal.*amd64.*" rhel-8-6: ".*redhat.*8-6.*minimal.*amd64.*" + rhel-8-8: ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10: ".*redhat.*8-10.*minimal.*amd64.*" rhel-9-0: ".*redhat.*9-0.*minimal.*amd64.*" rhel-9-2: ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4: ".*redhat.*9-4.*minimal.*amd64.*" + sles-15-5: ".*sles.*15-5.*amd64-[0-9]" + sles-15-6: ".*sles.*15-6.*amd64-[0-9]" + # rhel-7-6-sap-ha: ".*redhat.*7-6.*amd64.*hana.*" # retrievable from deprecated list + # rhel-7-9-sap-ha: ".*redhat.*7-9.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-1-sap-ha: ".*redhat.*8-1.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-2-sap-ha: ".*redhat.*8-2.*amd64.*hana.*" # retrievable from deprecated list rhel-8-4-sap-ha: ".*redhat.*8-4.*amd64.*hana.*" rhel-8-6-sap-ha: ".*redhat.*8-6.*amd64.*hana.*" rhel-8-8-sap-ha: ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha: ".*redhat.*8-10.*amd64.*hana.*" rhel-9-0-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" - rhel-9-2-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha: ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha: ".*redhat.*9-4.*amd64.*hana.*" + # sles-12-4-sap-ha: ".*sles.*12-4.*amd64.*hana.*" # retrievable from deprecated list + # sles-12-5-sap-ha: ".*sles.*12-5.*amd64.*hana.*" # retrievable from deprecated list + # sles-15-1-sap-ha: ".*sles.*15-1.*amd64.*hana.*" # retrievable from deprecated list sles-15-3-sap-ha: ".*sles.*15-3.*amd64.*hana.*" sles-15-4-sap-ha: ".*sles.*15-4.*amd64.*hana.*" sles-15-5-sap-ha: ".*sles.*15-5.*amd64.*hana.*" + sles-15-6-sap-ha: ".*sles.*15-6.*amd64.*hana.*" sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: @@ -2280,17 +2344,26 @@ sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: # Full Linux subscription ppc64le OS Images with support and activation keys sap_vm_provision_ibmcloud_powervs_host_os_image_dictionary: - rhel-8-4: ".*RHEL.*8.*4" - rhel-8-6: ".*RHEL.*8.*6" + rhel-8-8: ".*RHEL.*8.*8" rhel-9-2: ".*RHEL.*9.*2" - sles-15-3: ".*SLES.*15.*3" - sles-15-4: ".*SLES.*15.*4" + rhel-9-4: ".*RHEL.*9.*4" + sles-15-5: ".*SLES.*15.*5$" + rhel-8-4-sap-ha: "RHEL8-SP4-SAP" rhel-8-6-sap-ha: ".*RHEL.*8.*6.*SAP$" # ensure string suffix using $ rhel-8-8-sap-ha: ".*RHEL.*8.*8.*SAP$" # ensure string suffix using $ rhel-9-2-sap-ha: ".*RHEL.*9.*2.*SAP$" # ensure string suffix using $ sles-15-2-sap-ha: ".*SLES.*15.*2.*SAP$" # ensure string suffix using $ sles-15-3-sap-ha: ".*SLES.*15.*3.*SAP$" # ensure string suffix using $ sles-15-4-sap-ha: ".*SLES.*15.*4.*SAP$" # ensure string suffix using $ + sles-15-5-sap-ha: "SLES15-SP5-SAP" + # rhel-8-4-sap-ha-byol: "RHEL8-SP4-SAP-BYOL" + # rhel-8-6-sap-ha-byol: ".*RHEL.*8.*6.*SAP-BYOL$" # ensure string suffix using $ + # rhel-8-8-sap-ha-byol: ".*RHEL.*8.*8.*SAP-BYOL$" # ensure string suffix using $ + # rhel-9-2-sap-ha-byol: ".*RHEL.*9.*2.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-2-sap-ha-byol: ".*SLES.*15.*2.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-3-sap-ha-byol: ".*SLES.*15.*3.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-4-sap-ha-byol: ".*SLES.*15.*4.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-5-sap-ha-byol: "SLES15-SP5-SAP-BYOL" sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: @@ -2348,7 +2421,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: - name: swap # hdb swap_path: /swapfile # use swap file on root disk, instead of creating LVM LV for swap disk_size: 2 - disk_type: tier3 + disk_type: tier1 filesystem_type: swap # must be swap filesystem - name: software @@ -2508,96 +2581,186 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: #### sap_vm_provision_msazure_vm_host_os_image_dictionary: - + rhel-8-0: + publisher: "RedHat" + offer: "RHEL" + sku: "8-gen2" + rhel-8-1: + publisher: "RedHat" + offer: "RHEL" + sku: "81-gen2" + rhel-8-2: + publisher: "RedHat" + offer: "RHEL" + sku: "82-gen2" + rhel-8-3: + publisher: "RedHat" + offer: "RHEL" + sku: "83-gen2" rhel-8-4: publisher: "RedHat" offer: "RHEL" sku: "84-gen2" - + rhel-8-5: + publisher: "RedHat" + offer: "RHEL" + sku: "85-gen2" + rhel-8-6: + publisher: "RedHat" + offer: "RHEL" + sku: "86-gen2" + rhel-8-7: + publisher: "RedHat" + offer: "RHEL" + sku: "87-gen2" + rhel-8-8: + publisher: "RedHat" + offer: "RHEL" + sku: "88-gen2" + rhel-8-9: + publisher: "RedHat" + offer: "RHEL" + sku: "89-gen2" + rhel-8-10: + publisher: "RedHat" + offer: "RHEL" + sku: "810-gen2" + rhel-9-0: + publisher: "RedHat" + offer: "RHEL" + sku: "90-gen2" + rhel-9-1: + publisher: "RedHat" + offer: "RHEL" + sku: "91-gen2" + rhel-9-2: + publisher: "RedHat" + offer: "RHEL" + sku: "92-gen2" + rhel-9-3: + publisher: "RedHat" + offer: "RHEL" + sku: "93-gen2" + rhel-9-4: + publisher: "RedHat" + offer: "RHEL" + sku: "94-gen2" + sles-12-5: + publisher: "SUSE" + offer: "sles-12-sp5" + sku: "gen2" + sles-15-1: + publisher: "SUSE" + offer: "sles-15-sp1" + sku: "gen2" + sles-15-2: + publisher: "SUSE" + offer: "sles-15-sp2" + sku: "gen2" + sles-15-3: + publisher: "SUSE" + offer: "sles-15-sp3" + sku: "gen2" + sles-15-4: + publisher: "SUSE" + offer: "sles-15-sp4" + sku: "gen2" + sles-15-5: + publisher: "SUSE" + offer: "sles-15-sp5" + sku: "gen2" + sles-15-6: + publisher: "SUSE" + offer: "sles-15-sp6" + sku: "gen2" rhel-8-1-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "81sapha-gen2" - rhel-8-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "82sapha-gen2" - rhel-8-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "84sapha-gen2" - rhel-8-6-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "86sapha-gen2" - rhel-8-8-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "88sapha-gen2" - + rhel-8-10-sap-ha: + publisher: "RedHat" + offer: "RHEL-SAP-HA" + sku: "810sapha-gen2" rhel-9-0-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "90sapha-gen2" - rhel-9-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "92sapha-gen2" - - rhel-8-1-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "81sapapps-gen2" - - rhel-8-2-sap-applications: + rhel-9-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" - sku: "82sapapps-gen2" - - rhel-8-4-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "84sapapps-gen2" - - rhel-8-6-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "86sapapps-gen2" - - rhel-8-8-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "88sapapps-gen2" - - rhel-9-0-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "90sapapps-gen2" - - rhel-9-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "92sapapps-gen2" - - sles-15-sp3-sap: + sku: "94sapha-gen2" + sles-12-5-sap-ha: + publisher: "SUSE" + offer: "sles-sap-12-sp5" + sku: "gen2" + sles-15-1-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp1" + sku: "gen2" + sles-15-2-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp2" + sku: "gen2" + sles-15-3-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp3" sku: "gen2" - - sles-15-sp4-sap: + sles-15-4-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp4" sku: "gen2" - - sles-15-sp5-sap: + sles-15-5-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp5" sku: "gen2" + sles-15-6-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp6" + sku: "gen2" + sles-15-1-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp1-byos" + sku: "gen2" + sles-15-2-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp2-byos" + sku: "gen2" + sles-15-3-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp3-byos" + sku: "gen2" + sles-15-4-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp4-byos" + sku: "gen2" + sles-15-5-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp5-byos" + sku: "gen2" + sles-15-6-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp6-byos" + sku: "gen2" sap_vm_provision_msazure_vm_host_specifications_dictionary: diff --git a/deploy_scenarios/sap_s4hana_distributed/ansible_playbook.yml b/deploy_scenarios/sap_s4hana_distributed/ansible_playbook.yml index 9a948f0..e16f9ac 100644 --- a/deploy_scenarios/sap_s4hana_distributed/ansible_playbook.yml +++ b/deploy_scenarios/sap_s4hana_distributed/ansible_playbook.yml @@ -144,7 +144,6 @@ mode: '0755' loop: - "{{ sap_install_media_detect_source_directory }}" - - "{{ sap_hana_install_software_directory }}" - name: Install Python package manager pip3 to system Python ansible.builtin.package: diff --git a/deploy_scenarios/sap_s4hana_distributed/ansible_requirements.yml b/deploy_scenarios/sap_s4hana_distributed/ansible_requirements.yml index af7ed22..1454ec5 100644 --- a/deploy_scenarios/sap_s4hana_distributed/ansible_requirements.yml +++ b/deploy_scenarios/sap_s4hana_distributed/ansible_requirements.yml @@ -8,16 +8,16 @@ collections: version: 6.1.0 - name: fedora.linux_system_roles type: galaxy - version: 1.82.0 + version: 1.88.9 - name: community.sap_install type: galaxy - version: 1.4.0 + version: 1.5.0 - name: community.sap_launchpad type: galaxy - version: 1.1.0 + version: 1.1.1 - name: community.sap_infrastructure type: galaxy - version: 1.0.1 + version: 1.1.0 # - name: community.sap_operations # type: galaxy # version: 0.9.1 @@ -25,23 +25,23 @@ collections: # Collections for Infrastructure from Ansible Galaxy - name: cloud.terraform type: galaxy - version: 1.1.0 + version: 3.0.0 - name: amazon.aws type: galaxy - version: 7.2.0 + version: 9.0.0 - name: community.aws type: galaxy - version: 7.1.0 + version: 9.0.0 - name: azure.azcollection type: galaxy - version: 2.2.0 + version: 3.0.1 - name: google.cloud type: galaxy version: 1.1.3 # Replace with ibm.cloud in future, legacy Ansible Collection uses hidden on-the-fly Terraform files in /var/tmp/ansible/ibmcloud) - name: ibm.cloudcollection type: galaxy - version: 1.51.0 + version: 1.71.2 - name: ovirt.ovirt type: galaxy version: 3.1.2 @@ -53,21 +53,12 @@ collections: version: 3.0.0 - name: cloud.common type: galaxy - version: 3.0.0 + version: 4.0.0 # Collections from public repositories via HTTPS # - name: https://github.com/sap-linuxlab/community.sap_install.git # type: git # version: dev -# - name: https://github.com/sap-linuxlab/community.sap_launchpad.git -# type: git -# version: main -# - name: https://github.com/sap-linuxlab/community.sap_operations.git -# type: git -# version: main -# - name: https://github.com/ansible-collections/cloud.terraform.git -# type: git -# version: main # Collections from private repositories via use SSH (embedded GitHub PAT does not work) # Used for customised/forked Ansible Collections diff --git a/deploy_scenarios/sap_s4hana_distributed/optional/ansible_extravars_noninteractive.yml b/deploy_scenarios/sap_s4hana_distributed/optional/ansible_extravars_noninteractive.yml index 0f728ce..4871312 100755 --- a/deploy_scenarios/sap_s4hana_distributed/optional/ansible_extravars_noninteractive.yml +++ b/deploy_scenarios/sap_s4hana_distributed/optional/ansible_extravars_noninteractive.yml @@ -126,13 +126,14 @@ sap_vm_provision_nfs_mount_point_opts: nfsvers=4.1,sec=sys,_netdev,hard,timeo=60 #### sap_vm_provision_ibmcloud_api_key: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ibmcloud_resource_group_name: "ENTER_STRING_VALUE_HERE" # if ansible_to_terraform, use "new" -sap_vm_provision_ibmcloud_private_dns_instance_name: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_private_dns_instance_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform sap_vm_provision_ibmcloud_powervs_location: "ENTER_STRING_VALUE_HERE" -sap_vm_provision_ibmcloud_powervs_workspace_name: "ENTER_STRING_VALUE_HERE" -sap_vm_provision_ibmcloud_powervs_vlan_subnet_name: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_powervs_workspace_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform +sap_vm_provision_ibmcloud_powervs_vlan_subnet_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform sap_vm_provision_ibmcloud_powervs_host_os_image: "ENTER_STRING_VALUE_HERE" sap_vm_provision_bastion_user: "ENTER_STRING_VALUE_HERE" sap_vm_provision_bastion_ssh_port: "ENTER_STRING_VALUE_HERE" +# sap_vm_provision_ibmcloud_vpc_subnet_name: "ENTER_STRING_VALUE_HERE" # only for ansible_to_terraform, can be name or 'new' # Only for use when 'ansible' is value provided for variable sap_vm_provision_iac_type #### @@ -140,6 +141,7 @@ sap_vm_provision_bastion_public_ip: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ssh_bastion_private_key_file_path: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ssh_host_private_key_file_path: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ibmcloud_powervs_key_pair_name_ssh_host_public_key: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_private_dns_custom_resolver_ip: "ENTER_STRING_VALUE_HERE" # sap_vm_provision_ibmcloud_private_dns_resource_group_name: "" # optional, default use of sap_vm_provision_ibmcloud_resource_group_name sap_vm_provision_proxy_web_forward_proxy_ip: "ENTER_STRING_VALUE_HERE" # IP:Port only, no http:// prefix sap_vm_provision_proxy_web_forward_exclusions: "localhost,127.0.0.1,{{ sap_vm_provision_dns_root_domain }}" @@ -357,7 +359,7 @@ sap_id_user: "ENTER_STRING_VALUE_HERE" sap_id_user_password: 'ENTER_STRING_VALUE_HERE' # Directory for SAP installation media -sap_software_download_directory: "ENTER_STRING_VALUE_HERE" +sap_install_media_detect_source_directory: "ENTER_STRING_VALUE_HERE" # e.g. /software #### diff --git a/deploy_scenarios/sap_s4hana_distributed_ha/ansible_extravars.yml b/deploy_scenarios/sap_s4hana_distributed_ha/ansible_extravars.yml index 254fa55..d7488b6 100755 --- a/deploy_scenarios/sap_s4hana_distributed_ha/ansible_extravars.yml +++ b/deploy_scenarios/sap_s4hana_distributed_ha/ansible_extravars.yml @@ -99,9 +99,9 @@ sap_netweaver_preconfigure_fail_if_not_enough_swap_space_configured: false #### # Mandatory parameters : Virtual IPs (VIPs) #### -#sap_ha_pacemaker_cluster_vip_hana_primary_ip_address: "SET_IN_VAR_PROMPT" -#sap_ha_pacemaker_cluster_vip_nwas_abap_ascs_ip_address: "SET_IN_VAR_PROMPT" -#sap_ha_pacemaker_cluster_vip_nwas_abap_ers_ip_address: "SET_IN_VAR_PROMPT" +#sap_vm_provision_ha_vip_hana_primary: "SET_IN_VAR_PROMPT" +#sap_vm_provision_ha_vip_nwas_abap_ascs: "SET_IN_VAR_PROMPT" +#sap_vm_provision_ha_vip_nwas_abap_ers: "SET_IN_VAR_PROMPT" #### @@ -1848,27 +1848,43 @@ sap_swpm_templates_install_dictionary: sap_vm_provision_aws_ec2_vs_host_os_image_dictionary: rhel-8-1: "*RHEL-8.1*_HVM*x86_64*" - rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" + # rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" # removed rhel-8-4: "*RHEL-8.4*_HVM*x86_64*" rhel-8-6: "*RHEL-8.6*_HVM*x86_64*" rhel-8-8: "*RHEL-8.8*_HVM*x86_64*" + rhel-8-10: "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0: "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1: "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2: "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3: "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4: "*RHEL-9.4*_HVM*x86_64*" + sles-12-5: "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" # removed + # sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" # removed + # sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" # removed + sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6: "*suse-sles-15-sp6-v202*-hvm-ssd-x86_64*" + # rhel-7-7-sap-ha: "*RHEL-SAP-8.1.0*" # removed + # rhel-7-9-sap-ha: "*RHEL-SAP-8.1.0*" # removed rhel-8-1-sap-ha: "*RHEL-SAP-8.1.0*" rhel-8-2-sap-ha: "*RHEL-SAP-8.2.0*" rhel-8-4-sap-ha: "*RHEL-SAP-8.4.0*" rhel-8-6-sap-ha: "*RHEL-SAP-8.6.0*" rhel-8-8-sap-ha: "*RHEL-SAP-8.8.0*" + rhel-8-10-sap-ha: "*RHEL-SAP-8.10.0*" rhel-9-0-sap-ha: "*RHEL-SAP-9.0.0*" rhel-9-2-sap-ha: "*RHEL-SAP-9.2.0*" - sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" - sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" - sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" - sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + rhel-9-4-sap-ha: "*RHEL-SAP-9.4.0*" sles-12-5-sap-ha: "*suse-sles-sap-12-sp5-v202*-hvm-ssd-x86_64*" sles-15-1-sap-ha: "*suse-sles-sap-15-sp1-v202*-hvm-ssd-x86_64*" sles-15-2-sap-ha: "*suse-sles-sap-15-sp2-v202*-hvm-ssd-x86_64*" sles-15-3-sap-ha: "*suse-sles-sap-15-sp3-v202*-hvm-ssd-x86_64*" sles-15-4-sap-ha: "*suse-sles-sap-15-sp4-v202*-hvm-ssd-x86_64*" sles-15-5-sap-ha: "*suse-sles-sap-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha: "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" + sles-15-4-sap-ha-byos: "*suse-sles-sap-15-sp4-byos-v202*-hvm-ssd-x86_64*" + sles-15-5-sap-ha-byos: "*suse-sles-sap-15-sp5-byos-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha-byos: "*suse-sles-sap-15-sp6-byos-v202*-hvm-ssd-x86_64*" sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: @@ -2162,42 +2178,75 @@ sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: #### sap_vm_provision_gcp_ce_vm_host_os_image_dictionary: - rhel-8-latest: project: "rhel-cloud" family: "rhel-8" - - rhel-8-1-sap-ha: + rhel-9-latest: + project: "rhel-cloud" + family: "rhel-9" + sles-12-latest: + project: "suse-cloud" + family: "sles-12" + sles-15-latest: + project: "suse-cloud" + family: "sles-15" + # rhel-7-7-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-7-7-sap-ha" + rhel-7-9-sap-ha: project: "rhel-sap-cloud" - family: "rhel-8-1-sap-ha" - + family: "rhel-7-9-sap-ha" + # rhel-8-1-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-8-1-sap-ha" rhel-8-2-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-2-sap-ha" - rhel-8-4-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-4-sap-ha" - rhel-8-6-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-6-sap-ha" - - sles-15-latest: - project: "suse-cloud" - family: "sles-15" - - sles-15-sp3-sap: + sles-12-5-sap-ha: + project: "suse-sap-cloud" + family: "sles-12-sp5-sap" + # sles-15-1-sap-ha: # removed + # project: "suse-sap-cloud" + # family: "sles-15-sp1-sap" + sles-15-2-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp2-sap" + sles-15-3-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp3-sap" - - sles-15-sp4-sap: + sles-15-4-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp4-sap" - - sles-15-sp5-sap: + sles-15-5-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp5-sap" + sles-15-6-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp6-sap" + sles-12-5-sap-ha-byos: + project: "suse-byos-cloud" + family: "sles-12-sp5-sap-byos" + sles-15-2-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp2-sap-byos" + sles-15-3-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp3-sap-byos" + sles-15-4-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp4-sap-byos" + sles-15-5-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp5-sap-byos" + sles-15-6-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp6-sap-byos" sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: @@ -2516,16 +2565,31 @@ sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: sap_vm_provision_ibmcloud_vs_host_os_image_dictionary: rhel-8-4: ".*redhat.*8-4.*minimal.*amd64.*" rhel-8-6: ".*redhat.*8-6.*minimal.*amd64.*" + rhel-8-8: ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10: ".*redhat.*8-10.*minimal.*amd64.*" rhel-9-0: ".*redhat.*9-0.*minimal.*amd64.*" rhel-9-2: ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4: ".*redhat.*9-4.*minimal.*amd64.*" + sles-15-5: ".*sles.*15-5.*amd64-[0-9]" + sles-15-6: ".*sles.*15-6.*amd64-[0-9]" + # rhel-7-6-sap-ha: ".*redhat.*7-6.*amd64.*hana.*" # retrievable from deprecated list + # rhel-7-9-sap-ha: ".*redhat.*7-9.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-1-sap-ha: ".*redhat.*8-1.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-2-sap-ha: ".*redhat.*8-2.*amd64.*hana.*" # retrievable from deprecated list rhel-8-4-sap-ha: ".*redhat.*8-4.*amd64.*hana.*" rhel-8-6-sap-ha: ".*redhat.*8-6.*amd64.*hana.*" rhel-8-8-sap-ha: ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha: ".*redhat.*8-10.*amd64.*hana.*" rhel-9-0-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" - rhel-9-2-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha: ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha: ".*redhat.*9-4.*amd64.*hana.*" + # sles-12-4-sap-ha: ".*sles.*12-4.*amd64.*hana.*" # retrievable from deprecated list + # sles-12-5-sap-ha: ".*sles.*12-5.*amd64.*hana.*" # retrievable from deprecated list + # sles-15-1-sap-ha: ".*sles.*15-1.*amd64.*hana.*" # retrievable from deprecated list sles-15-3-sap-ha: ".*sles.*15-3.*amd64.*hana.*" sles-15-4-sap-ha: ".*sles.*15-4.*amd64.*hana.*" sles-15-5-sap-ha: ".*sles.*15-5.*amd64.*hana.*" + sles-15-6-sap-ha: ".*sles.*15-6.*amd64.*hana.*" sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: @@ -2830,17 +2894,26 @@ sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: # Full Linux subscription ppc64le OS Images with support and activation keys sap_vm_provision_ibmcloud_powervs_host_os_image_dictionary: - rhel-8-4: ".*RHEL.*8.*4" - rhel-8-6: ".*RHEL.*8.*6" + rhel-8-8: ".*RHEL.*8.*8" rhel-9-2: ".*RHEL.*9.*2" - sles-15-3: ".*SLES.*15.*3" - sles-15-4: ".*SLES.*15.*4" + rhel-9-4: ".*RHEL.*9.*4" + sles-15-5: ".*SLES.*15.*5$" + rhel-8-4-sap-ha: "RHEL8-SP4-SAP" rhel-8-6-sap-ha: ".*RHEL.*8.*6.*SAP$" # ensure string suffix using $ rhel-8-8-sap-ha: ".*RHEL.*8.*8.*SAP$" # ensure string suffix using $ rhel-9-2-sap-ha: ".*RHEL.*9.*2.*SAP$" # ensure string suffix using $ sles-15-2-sap-ha: ".*SLES.*15.*2.*SAP$" # ensure string suffix using $ sles-15-3-sap-ha: ".*SLES.*15.*3.*SAP$" # ensure string suffix using $ sles-15-4-sap-ha: ".*SLES.*15.*4.*SAP$" # ensure string suffix using $ + sles-15-5-sap-ha: "SLES15-SP5-SAP" + # rhel-8-4-sap-ha-byol: "RHEL8-SP4-SAP-BYOL" + # rhel-8-6-sap-ha-byol: ".*RHEL.*8.*6.*SAP-BYOL$" # ensure string suffix using $ + # rhel-8-8-sap-ha-byol: ".*RHEL.*8.*8.*SAP-BYOL$" # ensure string suffix using $ + # rhel-9-2-sap-ha-byol: ".*RHEL.*9.*2.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-2-sap-ha-byol: ".*SLES.*15.*2.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-3-sap-ha-byol: ".*SLES.*15.*3.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-4-sap-ha-byol: ".*SLES.*15.*4.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-5-sap-ha-byol: "SLES15-SP5-SAP-BYOL" sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: @@ -2898,7 +2971,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: - name: swap # hdb swap_path: /swapfile # use swap file on root disk, instead of creating LVM LV for swap disk_size: 2 - disk_type: tier3 + disk_type: tier1 filesystem_type: swap # must be swap filesystem - name: software @@ -2945,7 +3018,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: - name: swap # hdb swap_path: /swapfile # use swap file on root disk, instead of creating LVM LV for swap disk_size: 2 - disk_type: tier3 + disk_type: tier1 filesystem_type: swap # must be swap filesystem - name: software @@ -3153,96 +3226,186 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: #### sap_vm_provision_msazure_vm_host_os_image_dictionary: - + rhel-8-0: + publisher: "RedHat" + offer: "RHEL" + sku: "8-gen2" + rhel-8-1: + publisher: "RedHat" + offer: "RHEL" + sku: "81-gen2" + rhel-8-2: + publisher: "RedHat" + offer: "RHEL" + sku: "82-gen2" + rhel-8-3: + publisher: "RedHat" + offer: "RHEL" + sku: "83-gen2" rhel-8-4: publisher: "RedHat" offer: "RHEL" sku: "84-gen2" - + rhel-8-5: + publisher: "RedHat" + offer: "RHEL" + sku: "85-gen2" + rhel-8-6: + publisher: "RedHat" + offer: "RHEL" + sku: "86-gen2" + rhel-8-7: + publisher: "RedHat" + offer: "RHEL" + sku: "87-gen2" + rhel-8-8: + publisher: "RedHat" + offer: "RHEL" + sku: "88-gen2" + rhel-8-9: + publisher: "RedHat" + offer: "RHEL" + sku: "89-gen2" + rhel-8-10: + publisher: "RedHat" + offer: "RHEL" + sku: "810-gen2" + rhel-9-0: + publisher: "RedHat" + offer: "RHEL" + sku: "90-gen2" + rhel-9-1: + publisher: "RedHat" + offer: "RHEL" + sku: "91-gen2" + rhel-9-2: + publisher: "RedHat" + offer: "RHEL" + sku: "92-gen2" + rhel-9-3: + publisher: "RedHat" + offer: "RHEL" + sku: "93-gen2" + rhel-9-4: + publisher: "RedHat" + offer: "RHEL" + sku: "94-gen2" + sles-12-5: + publisher: "SUSE" + offer: "sles-12-sp5" + sku: "gen2" + sles-15-1: + publisher: "SUSE" + offer: "sles-15-sp1" + sku: "gen2" + sles-15-2: + publisher: "SUSE" + offer: "sles-15-sp2" + sku: "gen2" + sles-15-3: + publisher: "SUSE" + offer: "sles-15-sp3" + sku: "gen2" + sles-15-4: + publisher: "SUSE" + offer: "sles-15-sp4" + sku: "gen2" + sles-15-5: + publisher: "SUSE" + offer: "sles-15-sp5" + sku: "gen2" + sles-15-6: + publisher: "SUSE" + offer: "sles-15-sp6" + sku: "gen2" rhel-8-1-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "81sapha-gen2" - rhel-8-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "82sapha-gen2" - rhel-8-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "84sapha-gen2" - rhel-8-6-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "86sapha-gen2" - rhel-8-8-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "88sapha-gen2" - + rhel-8-10-sap-ha: + publisher: "RedHat" + offer: "RHEL-SAP-HA" + sku: "810sapha-gen2" rhel-9-0-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "90sapha-gen2" - rhel-9-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "92sapha-gen2" - - rhel-8-1-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "81sapapps-gen2" - - rhel-8-2-sap-applications: + rhel-9-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" - sku: "82sapapps-gen2" - - rhel-8-4-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "84sapapps-gen2" - - rhel-8-6-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "86sapapps-gen2" - - rhel-8-8-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "88sapapps-gen2" - - rhel-9-0-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "90sapapps-gen2" - - rhel-9-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "92sapapps-gen2" - - sles-15-sp3-sap: + sku: "94sapha-gen2" + sles-12-5-sap-ha: + publisher: "SUSE" + offer: "sles-sap-12-sp5" + sku: "gen2" + sles-15-1-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp1" + sku: "gen2" + sles-15-2-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp2" + sku: "gen2" + sles-15-3-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp3" sku: "gen2" - - sles-15-sp4-sap: + sles-15-4-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp4" sku: "gen2" - - sles-15-sp5-sap: + sles-15-5-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp5" sku: "gen2" + sles-15-6-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp6" + sku: "gen2" + sles-15-1-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp1-byos" + sku: "gen2" + sles-15-2-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp2-byos" + sku: "gen2" + sles-15-3-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp3-byos" + sku: "gen2" + sles-15-4-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp4-byos" + sku: "gen2" + sles-15-5-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp5-byos" + sku: "gen2" + sles-15-6-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp6-byos" + sku: "gen2" sap_vm_provision_msazure_vm_host_specifications_dictionary: diff --git a/deploy_scenarios/sap_s4hana_distributed_ha/ansible_playbook.yml b/deploy_scenarios/sap_s4hana_distributed_ha/ansible_playbook.yml index a75db17..347f64a 100644 --- a/deploy_scenarios/sap_s4hana_distributed_ha/ansible_playbook.yml +++ b/deploy_scenarios/sap_s4hana_distributed_ha/ansible_playbook.yml @@ -149,7 +149,6 @@ mode: '0755' loop: - "{{ sap_install_media_detect_source_directory }}" - - "{{ sap_hana_install_software_directory }}" - name: Install Python package manager pip3 to system Python ansible.builtin.package: @@ -752,3 +751,31 @@ vars: sap_vm_provision_iac_post_deployment: true when: sap_vm_provision_iac_type == "ansible" + + +- name: "Ansible Play for login shortcut" + hosts: localhost + gather_facts: false + tasks: + + - name: Display login shortcut with SSH Port Forward binding from localhost to Virtual IP of SAP HANA or SAP NetWeaver ASCS + ansible.builtin.debug: + msg: | + export bastion_user="{{ sap_vm_provision_bastion_user }}" + export bastion_host="{{ sap_vm_provision_bastion_public_ip }}" + export bastion_port="{{ sap_vm_provision_bastion_ssh_port }}" + export bastion_private_key_file="{{ sap_vm_provision_ssh_bastion_private_key_file_path }}" + export sap_hana_instance_nr="{{ sap_system_hana_db_instance_nr }}" + export sap_hana_virtual_ip="{{ sap_vm_provision_ha_vip_hana_primary }}" + export sap_nwas_ascs_instance_nr="{{ sap_system_nwas_abap_ascs_instance_nr }}" + export sap_nwas_ascs_virtual_ip="{{ sap_vm_provision_ha_vip_nwas_abap_ascs }}" + + ssh -4 -N $bastion_user@$bastion_host -p $bastion_port -i $bastion_private_key_file -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ServerAliveInterval=60 -o ServerAliveCountMax=600 \ + -L localhost:32${sap_nwas_ascs_instance_nr}:${sap_nwas_ascs_virtual_ip:32${sap_nwas_ascs_instance_nr} \ + -L localhost:3${sap_hana_instance_nr}13:${sap_hana_virtual_ip}:3${sap_hana_instance_nr}13 \ + -L localhost:3${sap_hana_instance_nr}15:${sap_hana_virtual_ip}:3${sap_hana_instance_nr}15 \ + -L localhost:5${sap_hana_instance_nr}13:${sap_hana_virtual_ip}:5${sap_hana_instance_nr}13 \ + -L localhost:5${sap_hana_instance_nr}15:${sap_hana_virtual_ip}:5${sap_hana_instance_nr}15 + + # For SAPGUI, use expert mode with SAP Logon String + conn=/H/localhost/S/32{{ sap_system_nwas_abap_ascs_instance_nr }}&expert=true diff --git a/deploy_scenarios/sap_s4hana_distributed_ha/ansible_requirements.yml b/deploy_scenarios/sap_s4hana_distributed_ha/ansible_requirements.yml index af7ed22..1454ec5 100644 --- a/deploy_scenarios/sap_s4hana_distributed_ha/ansible_requirements.yml +++ b/deploy_scenarios/sap_s4hana_distributed_ha/ansible_requirements.yml @@ -8,16 +8,16 @@ collections: version: 6.1.0 - name: fedora.linux_system_roles type: galaxy - version: 1.82.0 + version: 1.88.9 - name: community.sap_install type: galaxy - version: 1.4.0 + version: 1.5.0 - name: community.sap_launchpad type: galaxy - version: 1.1.0 + version: 1.1.1 - name: community.sap_infrastructure type: galaxy - version: 1.0.1 + version: 1.1.0 # - name: community.sap_operations # type: galaxy # version: 0.9.1 @@ -25,23 +25,23 @@ collections: # Collections for Infrastructure from Ansible Galaxy - name: cloud.terraform type: galaxy - version: 1.1.0 + version: 3.0.0 - name: amazon.aws type: galaxy - version: 7.2.0 + version: 9.0.0 - name: community.aws type: galaxy - version: 7.1.0 + version: 9.0.0 - name: azure.azcollection type: galaxy - version: 2.2.0 + version: 3.0.1 - name: google.cloud type: galaxy version: 1.1.3 # Replace with ibm.cloud in future, legacy Ansible Collection uses hidden on-the-fly Terraform files in /var/tmp/ansible/ibmcloud) - name: ibm.cloudcollection type: galaxy - version: 1.51.0 + version: 1.71.2 - name: ovirt.ovirt type: galaxy version: 3.1.2 @@ -53,21 +53,12 @@ collections: version: 3.0.0 - name: cloud.common type: galaxy - version: 3.0.0 + version: 4.0.0 # Collections from public repositories via HTTPS # - name: https://github.com/sap-linuxlab/community.sap_install.git # type: git # version: dev -# - name: https://github.com/sap-linuxlab/community.sap_launchpad.git -# type: git -# version: main -# - name: https://github.com/sap-linuxlab/community.sap_operations.git -# type: git -# version: main -# - name: https://github.com/ansible-collections/cloud.terraform.git -# type: git -# version: main # Collections from private repositories via use SSH (embedded GitHub PAT does not work) # Used for customised/forked Ansible Collections diff --git a/deploy_scenarios/sap_s4hana_distributed_ha/optional/ansible_extravars_noninteractive.yml b/deploy_scenarios/sap_s4hana_distributed_ha/optional/ansible_extravars_noninteractive.yml index 11fb97a..bf3e7fb 100755 --- a/deploy_scenarios/sap_s4hana_distributed_ha/optional/ansible_extravars_noninteractive.yml +++ b/deploy_scenarios/sap_s4hana_distributed_ha/optional/ansible_extravars_noninteractive.yml @@ -127,13 +127,14 @@ sap_vm_provision_nfs_mount_point_opts: nfsvers=4.1,sec=sys,_netdev,hard,timeo=60 #### sap_vm_provision_ibmcloud_api_key: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ibmcloud_resource_group_name: "ENTER_STRING_VALUE_HERE" # if ansible_to_terraform, use "new" -sap_vm_provision_ibmcloud_private_dns_instance_name: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_private_dns_instance_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform sap_vm_provision_ibmcloud_powervs_location: "ENTER_STRING_VALUE_HERE" -sap_vm_provision_ibmcloud_powervs_workspace_name: "ENTER_STRING_VALUE_HERE" -sap_vm_provision_ibmcloud_powervs_vlan_subnet_name: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_powervs_workspace_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform +sap_vm_provision_ibmcloud_powervs_vlan_subnet_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform sap_vm_provision_ibmcloud_powervs_host_os_image: "ENTER_STRING_VALUE_HERE" sap_vm_provision_bastion_user: "ENTER_STRING_VALUE_HERE" sap_vm_provision_bastion_ssh_port: "ENTER_STRING_VALUE_HERE" +# sap_vm_provision_ibmcloud_vpc_subnet_name: "ENTER_STRING_VALUE_HERE" # only for ansible_to_terraform, can be name or 'new' # Only for use when 'ansible' is value provided for variable sap_vm_provision_iac_type #### @@ -141,6 +142,7 @@ sap_vm_provision_bastion_public_ip: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ssh_bastion_private_key_file_path: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ssh_host_private_key_file_path: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ibmcloud_powervs_key_pair_name_ssh_host_public_key: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_private_dns_custom_resolver_ip: "ENTER_STRING_VALUE_HERE" # sap_vm_provision_ibmcloud_private_dns_resource_group_name: "" # optional, default use of sap_vm_provision_ibmcloud_resource_group_name sap_vm_provision_proxy_web_forward_proxy_ip: "ENTER_STRING_VALUE_HERE" # IP:Port only, no http:// prefix sap_vm_provision_proxy_web_forward_exclusions: "localhost,127.0.0.1,{{ sap_vm_provision_dns_root_domain }}" @@ -362,7 +364,7 @@ sap_id_user: "ENTER_STRING_VALUE_HERE" sap_id_user_password: 'ENTER_STRING_VALUE_HERE' # Directory for SAP installation media -sap_software_download_directory: "ENTER_STRING_VALUE_HERE" +sap_install_media_detect_source_directory: "ENTER_STRING_VALUE_HERE" # e.g. /software #### @@ -416,19 +418,20 @@ sap_ha_install_hana_hsr_db_system_password: "{{ sap_hana_install_master_password #### -# Mandatory parameters : Virtual IPs (VIPs) -# AWS: the VIP must be **outside** of any VPC Subnet ranges -# GCP: the VIP must be within the VPC Subnetwork range attached to GCP Backend Service for the Internal passthrough Network Load Balancer -# IBM Cloud: the VIP is within the VPC Subnet range and is statically defined by the IBM Cloud Load Balancer (NLB L4 or ALB L7) -# IBM Cloud, Power VS: the VIP must be within the IBM Power Infrastructure VLAN Subnet range -# MS Azure: the VIP must be within the VNet Subnet range attached to the Azure Load Balancer (NLB L4) +# Infrastructure Platform - High Availability Virtual IPs (VIPs) +# +# AWS: the VIP must be **outside** of any VPC Subnet ranges (e.g. 192.168.100.102/32) +# GCP: the VIP must be within the VPC Subnetwork range attached to GCP Backend Service for the Internal passthrough Network Load Balancer (e.g. 10.10.10.10/32) +# IBM Cloud: the VIP is within the VPC Subnet range and is statically defined by the IBM Cloud Load Balancer [NLB L4 or ALB L7], variable should be commented out +# IBM Cloud, Power VS: the VIP must be within the IBM Power Infrastructure VLAN Subnet range (e.g. 192.168.4.4/26) +# MS Azure: the VIP must be within the VNet Subnet range attached to the Azure Load Balancer [NLB L4] (e.g. 10.10.10.10/22) # IBM PowerVM: the VIP must be within the VLAN Subnet range # OVirt KVM: the VIP must be within the VLAN Subnet range # KubeVirt: the VIP must be within the VLAN Subnet range #### -sap_ha_pacemaker_cluster_vip_hana_primary_ip_address: "ENTER_STRING_VALUE_HERE" -sap_ha_pacemaker_cluster_vip_nwas_abap_ascs_ip_address: "ENTER_STRING_VALUE_HERE" -sap_ha_pacemaker_cluster_vip_nwas_abap_ers_ip_address: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ha_vip_hana_primary: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ha_vip_nwas_abap_ascs: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ha_vip_nwas_abap_ers: "ENTER_STRING_VALUE_HERE" #### diff --git a/deploy_scenarios/sap_s4hana_distributed_ha_maintplan/ansible_extravars.yml b/deploy_scenarios/sap_s4hana_distributed_ha_maintplan/ansible_extravars.yml index edb6f3e..54d475b 100755 --- a/deploy_scenarios/sap_s4hana_distributed_ha_maintplan/ansible_extravars.yml +++ b/deploy_scenarios/sap_s4hana_distributed_ha_maintplan/ansible_extravars.yml @@ -110,9 +110,9 @@ softwarecenter_search_list_sapcar_ppc64le: #### # Mandatory parameters : Virtual IPs (VIPs) #### -#sap_ha_pacemaker_cluster_vip_hana_primary_ip_address: "SET_IN_VAR_PROMPT" -#sap_ha_pacemaker_cluster_vip_nwas_abap_ascs_ip_address: "SET_IN_VAR_PROMPT" -#sap_ha_pacemaker_cluster_vip_nwas_abap_ers_ip_address: "SET_IN_VAR_PROMPT" +#sap_vm_provision_ha_vip_hana_primary: "SET_IN_VAR_PROMPT" +#sap_vm_provision_ha_vip_nwas_abap_ascs: "SET_IN_VAR_PROMPT" +#sap_vm_provision_ha_vip_nwas_abap_ers: "SET_IN_VAR_PROMPT" #### @@ -997,27 +997,43 @@ sap_swpm_templates_install_dictionary: sap_vm_provision_aws_ec2_vs_host_os_image_dictionary: rhel-8-1: "*RHEL-8.1*_HVM*x86_64*" - rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" + # rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" # removed rhel-8-4: "*RHEL-8.4*_HVM*x86_64*" rhel-8-6: "*RHEL-8.6*_HVM*x86_64*" rhel-8-8: "*RHEL-8.8*_HVM*x86_64*" + rhel-8-10: "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0: "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1: "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2: "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3: "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4: "*RHEL-9.4*_HVM*x86_64*" + sles-12-5: "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" # removed + # sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" # removed + # sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" # removed + sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6: "*suse-sles-15-sp6-v202*-hvm-ssd-x86_64*" + # rhel-7-7-sap-ha: "*RHEL-SAP-8.1.0*" # removed + # rhel-7-9-sap-ha: "*RHEL-SAP-8.1.0*" # removed rhel-8-1-sap-ha: "*RHEL-SAP-8.1.0*" rhel-8-2-sap-ha: "*RHEL-SAP-8.2.0*" rhel-8-4-sap-ha: "*RHEL-SAP-8.4.0*" rhel-8-6-sap-ha: "*RHEL-SAP-8.6.0*" rhel-8-8-sap-ha: "*RHEL-SAP-8.8.0*" + rhel-8-10-sap-ha: "*RHEL-SAP-8.10.0*" rhel-9-0-sap-ha: "*RHEL-SAP-9.0.0*" rhel-9-2-sap-ha: "*RHEL-SAP-9.2.0*" - sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" - sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" - sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" - sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + rhel-9-4-sap-ha: "*RHEL-SAP-9.4.0*" sles-12-5-sap-ha: "*suse-sles-sap-12-sp5-v202*-hvm-ssd-x86_64*" sles-15-1-sap-ha: "*suse-sles-sap-15-sp1-v202*-hvm-ssd-x86_64*" sles-15-2-sap-ha: "*suse-sles-sap-15-sp2-v202*-hvm-ssd-x86_64*" sles-15-3-sap-ha: "*suse-sles-sap-15-sp3-v202*-hvm-ssd-x86_64*" sles-15-4-sap-ha: "*suse-sles-sap-15-sp4-v202*-hvm-ssd-x86_64*" sles-15-5-sap-ha: "*suse-sles-sap-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha: "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" + sles-15-4-sap-ha-byos: "*suse-sles-sap-15-sp4-byos-v202*-hvm-ssd-x86_64*" + sles-15-5-sap-ha-byos: "*suse-sles-sap-15-sp5-byos-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha-byos: "*suse-sles-sap-15-sp6-byos-v202*-hvm-ssd-x86_64*" sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: @@ -1311,42 +1327,75 @@ sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: #### sap_vm_provision_gcp_ce_vm_host_os_image_dictionary: - rhel-8-latest: project: "rhel-cloud" family: "rhel-8" - - rhel-8-1-sap-ha: + rhel-9-latest: + project: "rhel-cloud" + family: "rhel-9" + sles-12-latest: + project: "suse-cloud" + family: "sles-12" + sles-15-latest: + project: "suse-cloud" + family: "sles-15" + # rhel-7-7-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-7-7-sap-ha" + rhel-7-9-sap-ha: project: "rhel-sap-cloud" - family: "rhel-8-1-sap-ha" - + family: "rhel-7-9-sap-ha" + # rhel-8-1-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-8-1-sap-ha" rhel-8-2-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-2-sap-ha" - rhel-8-4-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-4-sap-ha" - rhel-8-6-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-6-sap-ha" - - sles-15-latest: - project: "suse-cloud" - family: "sles-15" - - sles-15-sp3-sap: + sles-12-5-sap-ha: + project: "suse-sap-cloud" + family: "sles-12-sp5-sap" + # sles-15-1-sap-ha: # removed + # project: "suse-sap-cloud" + # family: "sles-15-sp1-sap" + sles-15-2-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp2-sap" + sles-15-3-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp3-sap" - - sles-15-sp4-sap: + sles-15-4-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp4-sap" - - sles-15-sp5-sap: + sles-15-5-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp5-sap" + sles-15-6-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp6-sap" + sles-12-5-sap-ha-byos: + project: "suse-byos-cloud" + family: "sles-12-sp5-sap-byos" + sles-15-2-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp2-sap-byos" + sles-15-3-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp3-sap-byos" + sles-15-4-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp4-sap-byos" + sles-15-5-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp5-sap-byos" + sles-15-6-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp6-sap-byos" sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: @@ -1665,16 +1714,31 @@ sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: sap_vm_provision_ibmcloud_vs_host_os_image_dictionary: rhel-8-4: ".*redhat.*8-4.*minimal.*amd64.*" rhel-8-6: ".*redhat.*8-6.*minimal.*amd64.*" + rhel-8-8: ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10: ".*redhat.*8-10.*minimal.*amd64.*" rhel-9-0: ".*redhat.*9-0.*minimal.*amd64.*" rhel-9-2: ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4: ".*redhat.*9-4.*minimal.*amd64.*" + sles-15-5: ".*sles.*15-5.*amd64-[0-9]" + sles-15-6: ".*sles.*15-6.*amd64-[0-9]" + # rhel-7-6-sap-ha: ".*redhat.*7-6.*amd64.*hana.*" # retrievable from deprecated list + # rhel-7-9-sap-ha: ".*redhat.*7-9.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-1-sap-ha: ".*redhat.*8-1.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-2-sap-ha: ".*redhat.*8-2.*amd64.*hana.*" # retrievable from deprecated list rhel-8-4-sap-ha: ".*redhat.*8-4.*amd64.*hana.*" rhel-8-6-sap-ha: ".*redhat.*8-6.*amd64.*hana.*" rhel-8-8-sap-ha: ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha: ".*redhat.*8-10.*amd64.*hana.*" rhel-9-0-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" - rhel-9-2-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha: ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha: ".*redhat.*9-4.*amd64.*hana.*" + # sles-12-4-sap-ha: ".*sles.*12-4.*amd64.*hana.*" # retrievable from deprecated list + # sles-12-5-sap-ha: ".*sles.*12-5.*amd64.*hana.*" # retrievable from deprecated list + # sles-15-1-sap-ha: ".*sles.*15-1.*amd64.*hana.*" # retrievable from deprecated list sles-15-3-sap-ha: ".*sles.*15-3.*amd64.*hana.*" sles-15-4-sap-ha: ".*sles.*15-4.*amd64.*hana.*" sles-15-5-sap-ha: ".*sles.*15-5.*amd64.*hana.*" + sles-15-6-sap-ha: ".*sles.*15-6.*amd64.*hana.*" sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: @@ -1979,17 +2043,26 @@ sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: # Full Linux subscription ppc64le OS Images with support and activation keys sap_vm_provision_ibmcloud_powervs_host_os_image_dictionary: - rhel-8-4: ".*RHEL.*8.*4" - rhel-8-6: ".*RHEL.*8.*6" + rhel-8-8: ".*RHEL.*8.*8" rhel-9-2: ".*RHEL.*9.*2" - sles-15-3: ".*SLES.*15.*3" - sles-15-4: ".*SLES.*15.*4" + rhel-9-4: ".*RHEL.*9.*4" + sles-15-5: ".*SLES.*15.*5$" + rhel-8-4-sap-ha: "RHEL8-SP4-SAP" rhel-8-6-sap-ha: ".*RHEL.*8.*6.*SAP$" # ensure string suffix using $ rhel-8-8-sap-ha: ".*RHEL.*8.*8.*SAP$" # ensure string suffix using $ rhel-9-2-sap-ha: ".*RHEL.*9.*2.*SAP$" # ensure string suffix using $ sles-15-2-sap-ha: ".*SLES.*15.*2.*SAP$" # ensure string suffix using $ sles-15-3-sap-ha: ".*SLES.*15.*3.*SAP$" # ensure string suffix using $ sles-15-4-sap-ha: ".*SLES.*15.*4.*SAP$" # ensure string suffix using $ + sles-15-5-sap-ha: "SLES15-SP5-SAP" + # rhel-8-4-sap-ha-byol: "RHEL8-SP4-SAP-BYOL" + # rhel-8-6-sap-ha-byol: ".*RHEL.*8.*6.*SAP-BYOL$" # ensure string suffix using $ + # rhel-8-8-sap-ha-byol: ".*RHEL.*8.*8.*SAP-BYOL$" # ensure string suffix using $ + # rhel-9-2-sap-ha-byol: ".*RHEL.*9.*2.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-2-sap-ha-byol: ".*SLES.*15.*2.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-3-sap-ha-byol: ".*SLES.*15.*3.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-4-sap-ha-byol: ".*SLES.*15.*4.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-5-sap-ha-byol: "SLES15-SP5-SAP-BYOL" sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: @@ -2047,7 +2120,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: - name: swap # hdb swap_path: /swapfile # use swap file on root disk, instead of creating LVM LV for swap disk_size: 2 - disk_type: tier3 + disk_type: tier1 filesystem_type: swap # must be swap filesystem - name: software @@ -2094,7 +2167,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: - name: swap # hdb swap_path: /swapfile # use swap file on root disk, instead of creating LVM LV for swap disk_size: 2 - disk_type: tier3 + disk_type: tier1 filesystem_type: swap # must be swap filesystem - name: software @@ -2302,96 +2375,186 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: #### sap_vm_provision_msazure_vm_host_os_image_dictionary: - + rhel-8-0: + publisher: "RedHat" + offer: "RHEL" + sku: "8-gen2" + rhel-8-1: + publisher: "RedHat" + offer: "RHEL" + sku: "81-gen2" + rhel-8-2: + publisher: "RedHat" + offer: "RHEL" + sku: "82-gen2" + rhel-8-3: + publisher: "RedHat" + offer: "RHEL" + sku: "83-gen2" rhel-8-4: publisher: "RedHat" offer: "RHEL" sku: "84-gen2" - + rhel-8-5: + publisher: "RedHat" + offer: "RHEL" + sku: "85-gen2" + rhel-8-6: + publisher: "RedHat" + offer: "RHEL" + sku: "86-gen2" + rhel-8-7: + publisher: "RedHat" + offer: "RHEL" + sku: "87-gen2" + rhel-8-8: + publisher: "RedHat" + offer: "RHEL" + sku: "88-gen2" + rhel-8-9: + publisher: "RedHat" + offer: "RHEL" + sku: "89-gen2" + rhel-8-10: + publisher: "RedHat" + offer: "RHEL" + sku: "810-gen2" + rhel-9-0: + publisher: "RedHat" + offer: "RHEL" + sku: "90-gen2" + rhel-9-1: + publisher: "RedHat" + offer: "RHEL" + sku: "91-gen2" + rhel-9-2: + publisher: "RedHat" + offer: "RHEL" + sku: "92-gen2" + rhel-9-3: + publisher: "RedHat" + offer: "RHEL" + sku: "93-gen2" + rhel-9-4: + publisher: "RedHat" + offer: "RHEL" + sku: "94-gen2" + sles-12-5: + publisher: "SUSE" + offer: "sles-12-sp5" + sku: "gen2" + sles-15-1: + publisher: "SUSE" + offer: "sles-15-sp1" + sku: "gen2" + sles-15-2: + publisher: "SUSE" + offer: "sles-15-sp2" + sku: "gen2" + sles-15-3: + publisher: "SUSE" + offer: "sles-15-sp3" + sku: "gen2" + sles-15-4: + publisher: "SUSE" + offer: "sles-15-sp4" + sku: "gen2" + sles-15-5: + publisher: "SUSE" + offer: "sles-15-sp5" + sku: "gen2" + sles-15-6: + publisher: "SUSE" + offer: "sles-15-sp6" + sku: "gen2" rhel-8-1-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "81sapha-gen2" - rhel-8-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "82sapha-gen2" - rhel-8-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "84sapha-gen2" - rhel-8-6-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "86sapha-gen2" - rhel-8-8-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "88sapha-gen2" - + rhel-8-10-sap-ha: + publisher: "RedHat" + offer: "RHEL-SAP-HA" + sku: "810sapha-gen2" rhel-9-0-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "90sapha-gen2" - rhel-9-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "92sapha-gen2" - - rhel-8-1-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "81sapapps-gen2" - - rhel-8-2-sap-applications: + rhel-9-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" - sku: "82sapapps-gen2" - - rhel-8-4-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "84sapapps-gen2" - - rhel-8-6-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "86sapapps-gen2" - - rhel-8-8-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "88sapapps-gen2" - - rhel-9-0-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "90sapapps-gen2" - - rhel-9-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "92sapapps-gen2" - - sles-15-sp3-sap: + sku: "94sapha-gen2" + sles-12-5-sap-ha: + publisher: "SUSE" + offer: "sles-sap-12-sp5" + sku: "gen2" + sles-15-1-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp1" + sku: "gen2" + sles-15-2-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp2" + sku: "gen2" + sles-15-3-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp3" sku: "gen2" - - sles-15-sp4-sap: + sles-15-4-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp4" sku: "gen2" - - sles-15-sp5-sap: + sles-15-5-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp5" sku: "gen2" + sles-15-6-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp6" + sku: "gen2" + sles-15-1-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp1-byos" + sku: "gen2" + sles-15-2-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp2-byos" + sku: "gen2" + sles-15-3-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp3-byos" + sku: "gen2" + sles-15-4-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp4-byos" + sku: "gen2" + sles-15-5-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp5-byos" + sku: "gen2" + sles-15-6-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp6-byos" + sku: "gen2" sap_vm_provision_msazure_vm_host_specifications_dictionary: diff --git a/deploy_scenarios/sap_s4hana_distributed_ha_maintplan/ansible_playbook.yml b/deploy_scenarios/sap_s4hana_distributed_ha_maintplan/ansible_playbook.yml index ecd86eb..a4f7851 100644 --- a/deploy_scenarios/sap_s4hana_distributed_ha_maintplan/ansible_playbook.yml +++ b/deploy_scenarios/sap_s4hana_distributed_ha_maintplan/ansible_playbook.yml @@ -149,7 +149,6 @@ mode: '0755' loop: - "{{ sap_install_media_detect_source_directory }}" - - "{{ sap_hana_install_software_directory }}" - name: Install Python package manager pip3 to system Python ansible.builtin.package: diff --git a/deploy_scenarios/sap_s4hana_distributed_ha_maintplan/ansible_requirements.yml b/deploy_scenarios/sap_s4hana_distributed_ha_maintplan/ansible_requirements.yml index af7ed22..1454ec5 100644 --- a/deploy_scenarios/sap_s4hana_distributed_ha_maintplan/ansible_requirements.yml +++ b/deploy_scenarios/sap_s4hana_distributed_ha_maintplan/ansible_requirements.yml @@ -8,16 +8,16 @@ collections: version: 6.1.0 - name: fedora.linux_system_roles type: galaxy - version: 1.82.0 + version: 1.88.9 - name: community.sap_install type: galaxy - version: 1.4.0 + version: 1.5.0 - name: community.sap_launchpad type: galaxy - version: 1.1.0 + version: 1.1.1 - name: community.sap_infrastructure type: galaxy - version: 1.0.1 + version: 1.1.0 # - name: community.sap_operations # type: galaxy # version: 0.9.1 @@ -25,23 +25,23 @@ collections: # Collections for Infrastructure from Ansible Galaxy - name: cloud.terraform type: galaxy - version: 1.1.0 + version: 3.0.0 - name: amazon.aws type: galaxy - version: 7.2.0 + version: 9.0.0 - name: community.aws type: galaxy - version: 7.1.0 + version: 9.0.0 - name: azure.azcollection type: galaxy - version: 2.2.0 + version: 3.0.1 - name: google.cloud type: galaxy version: 1.1.3 # Replace with ibm.cloud in future, legacy Ansible Collection uses hidden on-the-fly Terraform files in /var/tmp/ansible/ibmcloud) - name: ibm.cloudcollection type: galaxy - version: 1.51.0 + version: 1.71.2 - name: ovirt.ovirt type: galaxy version: 3.1.2 @@ -53,21 +53,12 @@ collections: version: 3.0.0 - name: cloud.common type: galaxy - version: 3.0.0 + version: 4.0.0 # Collections from public repositories via HTTPS # - name: https://github.com/sap-linuxlab/community.sap_install.git # type: git # version: dev -# - name: https://github.com/sap-linuxlab/community.sap_launchpad.git -# type: git -# version: main -# - name: https://github.com/sap-linuxlab/community.sap_operations.git -# type: git -# version: main -# - name: https://github.com/ansible-collections/cloud.terraform.git -# type: git -# version: main # Collections from private repositories via use SSH (embedded GitHub PAT does not work) # Used for customised/forked Ansible Collections diff --git a/deploy_scenarios/sap_s4hana_distributed_ha_maintplan/optional/ansible_extravars_noninteractive.yml b/deploy_scenarios/sap_s4hana_distributed_ha_maintplan/optional/ansible_extravars_noninteractive.yml index 24506a0..c76e061 100755 --- a/deploy_scenarios/sap_s4hana_distributed_ha_maintplan/optional/ansible_extravars_noninteractive.yml +++ b/deploy_scenarios/sap_s4hana_distributed_ha_maintplan/optional/ansible_extravars_noninteractive.yml @@ -127,13 +127,14 @@ sap_vm_provision_nfs_mount_point_opts: nfsvers=4.1,sec=sys,_netdev,hard,timeo=60 #### sap_vm_provision_ibmcloud_api_key: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ibmcloud_resource_group_name: "ENTER_STRING_VALUE_HERE" # if ansible_to_terraform, use "new" -sap_vm_provision_ibmcloud_private_dns_instance_name: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_private_dns_instance_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform sap_vm_provision_ibmcloud_powervs_location: "ENTER_STRING_VALUE_HERE" -sap_vm_provision_ibmcloud_powervs_workspace_name: "ENTER_STRING_VALUE_HERE" -sap_vm_provision_ibmcloud_powervs_vlan_subnet_name: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_powervs_workspace_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform +sap_vm_provision_ibmcloud_powervs_vlan_subnet_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform sap_vm_provision_ibmcloud_powervs_host_os_image: "ENTER_STRING_VALUE_HERE" sap_vm_provision_bastion_user: "ENTER_STRING_VALUE_HERE" sap_vm_provision_bastion_ssh_port: "ENTER_STRING_VALUE_HERE" +# sap_vm_provision_ibmcloud_vpc_subnet_name: "ENTER_STRING_VALUE_HERE" # only for ansible_to_terraform, can be name or 'new' # Only for use when 'ansible' is value provided for variable sap_vm_provision_iac_type #### @@ -141,6 +142,7 @@ sap_vm_provision_bastion_public_ip: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ssh_bastion_private_key_file_path: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ssh_host_private_key_file_path: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ibmcloud_powervs_key_pair_name_ssh_host_public_key: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_private_dns_custom_resolver_ip: "ENTER_STRING_VALUE_HERE" # sap_vm_provision_ibmcloud_private_dns_resource_group_name: "" # optional, default use of sap_vm_provision_ibmcloud_resource_group_name sap_vm_provision_proxy_web_forward_proxy_ip: "ENTER_STRING_VALUE_HERE" # IP:Port only, no http:// prefix sap_vm_provision_proxy_web_forward_exclusions: "localhost,127.0.0.1,{{ sap_vm_provision_dns_root_domain }}" @@ -365,7 +367,7 @@ sap_id_user_password: 'ENTER_STRING_VALUE_HERE' sap_maintenance_planner_transaction_name: 'ENTER_STRING_VALUE_HERE' # Directory for SAP installation media -sap_software_download_directory: "ENTER_STRING_VALUE_HERE" +sap_install_media_detect_source_directory: "ENTER_STRING_VALUE_HERE" # e.g. /software #### @@ -419,19 +421,20 @@ sap_ha_install_hana_hsr_db_system_password: "{{ sap_hana_install_master_password #### -# Mandatory parameters : Virtual IPs (VIPs) -# AWS: the VIP must be **outside** of any VPC Subnet ranges -# GCP: the VIP must be within the VPC Subnetwork range attached to GCP Backend Service for the Internal passthrough Network Load Balancer -# IBM Cloud: the VIP is within the VPC Subnet range and is statically defined by the IBM Cloud Load Balancer (NLB L4 or ALB L7) -# IBM Cloud, Power VS: the VIP must be within the IBM Power Infrastructure VLAN Subnet range -# MS Azure: the VIP must be within the VNet Subnet range attached to the Azure Load Balancer (NLB L4) +# Infrastructure Platform - High Availability Virtual IPs (VIPs) +# +# AWS: the VIP must be **outside** of any VPC Subnet ranges (e.g. 192.168.100.102/32) +# GCP: the VIP must be within the VPC Subnetwork range attached to GCP Backend Service for the Internal passthrough Network Load Balancer (e.g. 10.10.10.10/32) +# IBM Cloud: the VIP is within the VPC Subnet range and is statically defined by the IBM Cloud Load Balancer [NLB L4 or ALB L7], variable should be commented out +# IBM Cloud, Power VS: the VIP must be within the IBM Power Infrastructure VLAN Subnet range (e.g. 192.168.4.4/26) +# MS Azure: the VIP must be within the VNet Subnet range attached to the Azure Load Balancer [NLB L4] (e.g. 10.10.10.10/22) # IBM PowerVM: the VIP must be within the VLAN Subnet range # OVirt KVM: the VIP must be within the VLAN Subnet range # KubeVirt: the VIP must be within the VLAN Subnet range #### -sap_ha_pacemaker_cluster_vip_hana_primary_ip_address: "ENTER_STRING_VALUE_HERE" -sap_ha_pacemaker_cluster_vip_nwas_abap_ascs_ip_address: "ENTER_STRING_VALUE_HERE" -sap_ha_pacemaker_cluster_vip_nwas_abap_ers_ip_address: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ha_vip_hana_primary: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ha_vip_nwas_abap_ascs: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ha_vip_nwas_abap_ers: "ENTER_STRING_VALUE_HERE" #### diff --git a/deploy_scenarios/sap_s4hana_distributed_maintplan/ansible_extravars.yml b/deploy_scenarios/sap_s4hana_distributed_maintplan/ansible_extravars.yml index 718655c..d3881f0 100755 --- a/deploy_scenarios/sap_s4hana_distributed_maintplan/ansible_extravars.yml +++ b/deploy_scenarios/sap_s4hana_distributed_maintplan/ansible_extravars.yml @@ -931,27 +931,43 @@ sap_swpm_templates_install_dictionary: sap_vm_provision_aws_ec2_vs_host_os_image_dictionary: rhel-8-1: "*RHEL-8.1*_HVM*x86_64*" - rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" + # rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" # removed rhel-8-4: "*RHEL-8.4*_HVM*x86_64*" rhel-8-6: "*RHEL-8.6*_HVM*x86_64*" rhel-8-8: "*RHEL-8.8*_HVM*x86_64*" + rhel-8-10: "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0: "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1: "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2: "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3: "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4: "*RHEL-9.4*_HVM*x86_64*" + sles-12-5: "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" # removed + # sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" # removed + # sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" # removed + sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6: "*suse-sles-15-sp6-v202*-hvm-ssd-x86_64*" + # rhel-7-7-sap-ha: "*RHEL-SAP-8.1.0*" # removed + # rhel-7-9-sap-ha: "*RHEL-SAP-8.1.0*" # removed rhel-8-1-sap-ha: "*RHEL-SAP-8.1.0*" rhel-8-2-sap-ha: "*RHEL-SAP-8.2.0*" rhel-8-4-sap-ha: "*RHEL-SAP-8.4.0*" rhel-8-6-sap-ha: "*RHEL-SAP-8.6.0*" rhel-8-8-sap-ha: "*RHEL-SAP-8.8.0*" + rhel-8-10-sap-ha: "*RHEL-SAP-8.10.0*" rhel-9-0-sap-ha: "*RHEL-SAP-9.0.0*" rhel-9-2-sap-ha: "*RHEL-SAP-9.2.0*" - sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" - sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" - sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" - sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + rhel-9-4-sap-ha: "*RHEL-SAP-9.4.0*" sles-12-5-sap-ha: "*suse-sles-sap-12-sp5-v202*-hvm-ssd-x86_64*" sles-15-1-sap-ha: "*suse-sles-sap-15-sp1-v202*-hvm-ssd-x86_64*" sles-15-2-sap-ha: "*suse-sles-sap-15-sp2-v202*-hvm-ssd-x86_64*" sles-15-3-sap-ha: "*suse-sles-sap-15-sp3-v202*-hvm-ssd-x86_64*" sles-15-4-sap-ha: "*suse-sles-sap-15-sp4-v202*-hvm-ssd-x86_64*" sles-15-5-sap-ha: "*suse-sles-sap-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha: "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" + sles-15-4-sap-ha-byos: "*suse-sles-sap-15-sp4-byos-v202*-hvm-ssd-x86_64*" + sles-15-5-sap-ha-byos: "*suse-sles-sap-15-sp5-byos-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha-byos: "*suse-sles-sap-15-sp6-byos-v202*-hvm-ssd-x86_64*" sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: @@ -1159,42 +1175,75 @@ sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: #### sap_vm_provision_gcp_ce_vm_host_os_image_dictionary: - rhel-8-latest: project: "rhel-cloud" family: "rhel-8" - - rhel-8-1-sap-ha: + rhel-9-latest: + project: "rhel-cloud" + family: "rhel-9" + sles-12-latest: + project: "suse-cloud" + family: "sles-12" + sles-15-latest: + project: "suse-cloud" + family: "sles-15" + # rhel-7-7-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-7-7-sap-ha" + rhel-7-9-sap-ha: project: "rhel-sap-cloud" - family: "rhel-8-1-sap-ha" - + family: "rhel-7-9-sap-ha" + # rhel-8-1-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-8-1-sap-ha" rhel-8-2-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-2-sap-ha" - rhel-8-4-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-4-sap-ha" - rhel-8-6-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-6-sap-ha" - - sles-15-latest: - project: "suse-cloud" - family: "sles-15" - - sles-15-sp3-sap: + sles-12-5-sap-ha: + project: "suse-sap-cloud" + family: "sles-12-sp5-sap" + # sles-15-1-sap-ha: # removed + # project: "suse-sap-cloud" + # family: "sles-15-sp1-sap" + sles-15-2-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp2-sap" + sles-15-3-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp3-sap" - - sles-15-sp4-sap: + sles-15-4-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp4-sap" - - sles-15-sp5-sap: + sles-15-5-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp5-sap" + sles-15-6-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp6-sap" + sles-12-5-sap-ha-byos: + project: "suse-byos-cloud" + family: "sles-12-sp5-sap-byos" + sles-15-2-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp2-sap-byos" + sles-15-3-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp3-sap-byos" + sles-15-4-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp4-sap-byos" + sles-15-5-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp5-sap-byos" + sles-15-6-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp6-sap-byos" sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: @@ -1407,16 +1456,31 @@ sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: sap_vm_provision_ibmcloud_vs_host_os_image_dictionary: rhel-8-4: ".*redhat.*8-4.*minimal.*amd64.*" rhel-8-6: ".*redhat.*8-6.*minimal.*amd64.*" + rhel-8-8: ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10: ".*redhat.*8-10.*minimal.*amd64.*" rhel-9-0: ".*redhat.*9-0.*minimal.*amd64.*" rhel-9-2: ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4: ".*redhat.*9-4.*minimal.*amd64.*" + sles-15-5: ".*sles.*15-5.*amd64-[0-9]" + sles-15-6: ".*sles.*15-6.*amd64-[0-9]" + # rhel-7-6-sap-ha: ".*redhat.*7-6.*amd64.*hana.*" # retrievable from deprecated list + # rhel-7-9-sap-ha: ".*redhat.*7-9.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-1-sap-ha: ".*redhat.*8-1.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-2-sap-ha: ".*redhat.*8-2.*amd64.*hana.*" # retrievable from deprecated list rhel-8-4-sap-ha: ".*redhat.*8-4.*amd64.*hana.*" rhel-8-6-sap-ha: ".*redhat.*8-6.*amd64.*hana.*" rhel-8-8-sap-ha: ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha: ".*redhat.*8-10.*amd64.*hana.*" rhel-9-0-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" - rhel-9-2-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha: ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha: ".*redhat.*9-4.*amd64.*hana.*" + # sles-12-4-sap-ha: ".*sles.*12-4.*amd64.*hana.*" # retrievable from deprecated list + # sles-12-5-sap-ha: ".*sles.*12-5.*amd64.*hana.*" # retrievable from deprecated list + # sles-15-1-sap-ha: ".*sles.*15-1.*amd64.*hana.*" # retrievable from deprecated list sles-15-3-sap-ha: ".*sles.*15-3.*amd64.*hana.*" sles-15-4-sap-ha: ".*sles.*15-4.*amd64.*hana.*" sles-15-5-sap-ha: ".*sles.*15-5.*amd64.*hana.*" + sles-15-6-sap-ha: ".*sles.*15-6.*amd64.*hana.*" sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: @@ -1629,17 +1693,26 @@ sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: # Full Linux subscription ppc64le OS Images with support and activation keys sap_vm_provision_ibmcloud_powervs_host_os_image_dictionary: - rhel-8-4: ".*RHEL.*8.*4" - rhel-8-6: ".*RHEL.*8.*6" + rhel-8-8: ".*RHEL.*8.*8" rhel-9-2: ".*RHEL.*9.*2" - sles-15-3: ".*SLES.*15.*3" - sles-15-4: ".*SLES.*15.*4" + rhel-9-4: ".*RHEL.*9.*4" + sles-15-5: ".*SLES.*15.*5$" + rhel-8-4-sap-ha: "RHEL8-SP4-SAP" rhel-8-6-sap-ha: ".*RHEL.*8.*6.*SAP$" # ensure string suffix using $ rhel-8-8-sap-ha: ".*RHEL.*8.*8.*SAP$" # ensure string suffix using $ rhel-9-2-sap-ha: ".*RHEL.*9.*2.*SAP$" # ensure string suffix using $ sles-15-2-sap-ha: ".*SLES.*15.*2.*SAP$" # ensure string suffix using $ sles-15-3-sap-ha: ".*SLES.*15.*3.*SAP$" # ensure string suffix using $ sles-15-4-sap-ha: ".*SLES.*15.*4.*SAP$" # ensure string suffix using $ + sles-15-5-sap-ha: "SLES15-SP5-SAP" + # rhel-8-4-sap-ha-byol: "RHEL8-SP4-SAP-BYOL" + # rhel-8-6-sap-ha-byol: ".*RHEL.*8.*6.*SAP-BYOL$" # ensure string suffix using $ + # rhel-8-8-sap-ha-byol: ".*RHEL.*8.*8.*SAP-BYOL$" # ensure string suffix using $ + # rhel-9-2-sap-ha-byol: ".*RHEL.*9.*2.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-2-sap-ha-byol: ".*SLES.*15.*2.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-3-sap-ha-byol: ".*SLES.*15.*3.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-4-sap-ha-byol: ".*SLES.*15.*4.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-5-sap-ha-byol: "SLES15-SP5-SAP-BYOL" sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: @@ -1697,7 +1770,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: - name: swap # hdb swap_path: /swapfile # use swap file on root disk, instead of creating LVM LV for swap disk_size: 2 - disk_type: tier3 + disk_type: tier1 filesystem_type: swap # must be swap filesystem - name: software @@ -1857,96 +1930,186 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: #### sap_vm_provision_msazure_vm_host_os_image_dictionary: - + rhel-8-0: + publisher: "RedHat" + offer: "RHEL" + sku: "8-gen2" + rhel-8-1: + publisher: "RedHat" + offer: "RHEL" + sku: "81-gen2" + rhel-8-2: + publisher: "RedHat" + offer: "RHEL" + sku: "82-gen2" + rhel-8-3: + publisher: "RedHat" + offer: "RHEL" + sku: "83-gen2" rhel-8-4: publisher: "RedHat" offer: "RHEL" sku: "84-gen2" - + rhel-8-5: + publisher: "RedHat" + offer: "RHEL" + sku: "85-gen2" + rhel-8-6: + publisher: "RedHat" + offer: "RHEL" + sku: "86-gen2" + rhel-8-7: + publisher: "RedHat" + offer: "RHEL" + sku: "87-gen2" + rhel-8-8: + publisher: "RedHat" + offer: "RHEL" + sku: "88-gen2" + rhel-8-9: + publisher: "RedHat" + offer: "RHEL" + sku: "89-gen2" + rhel-8-10: + publisher: "RedHat" + offer: "RHEL" + sku: "810-gen2" + rhel-9-0: + publisher: "RedHat" + offer: "RHEL" + sku: "90-gen2" + rhel-9-1: + publisher: "RedHat" + offer: "RHEL" + sku: "91-gen2" + rhel-9-2: + publisher: "RedHat" + offer: "RHEL" + sku: "92-gen2" + rhel-9-3: + publisher: "RedHat" + offer: "RHEL" + sku: "93-gen2" + rhel-9-4: + publisher: "RedHat" + offer: "RHEL" + sku: "94-gen2" + sles-12-5: + publisher: "SUSE" + offer: "sles-12-sp5" + sku: "gen2" + sles-15-1: + publisher: "SUSE" + offer: "sles-15-sp1" + sku: "gen2" + sles-15-2: + publisher: "SUSE" + offer: "sles-15-sp2" + sku: "gen2" + sles-15-3: + publisher: "SUSE" + offer: "sles-15-sp3" + sku: "gen2" + sles-15-4: + publisher: "SUSE" + offer: "sles-15-sp4" + sku: "gen2" + sles-15-5: + publisher: "SUSE" + offer: "sles-15-sp5" + sku: "gen2" + sles-15-6: + publisher: "SUSE" + offer: "sles-15-sp6" + sku: "gen2" rhel-8-1-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "81sapha-gen2" - rhel-8-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "82sapha-gen2" - rhel-8-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "84sapha-gen2" - rhel-8-6-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "86sapha-gen2" - rhel-8-8-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "88sapha-gen2" - + rhel-8-10-sap-ha: + publisher: "RedHat" + offer: "RHEL-SAP-HA" + sku: "810sapha-gen2" rhel-9-0-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "90sapha-gen2" - rhel-9-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "92sapha-gen2" - - rhel-8-1-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "81sapapps-gen2" - - rhel-8-2-sap-applications: + rhel-9-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" - sku: "82sapapps-gen2" - - rhel-8-4-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "84sapapps-gen2" - - rhel-8-6-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "86sapapps-gen2" - - rhel-8-8-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "88sapapps-gen2" - - rhel-9-0-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "90sapapps-gen2" - - rhel-9-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "92sapapps-gen2" - - sles-15-sp3-sap: + sku: "94sapha-gen2" + sles-12-5-sap-ha: + publisher: "SUSE" + offer: "sles-sap-12-sp5" + sku: "gen2" + sles-15-1-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp1" + sku: "gen2" + sles-15-2-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp2" + sku: "gen2" + sles-15-3-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp3" sku: "gen2" - - sles-15-sp4-sap: + sles-15-4-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp4" sku: "gen2" - - sles-15-sp5-sap: + sles-15-5-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp5" sku: "gen2" + sles-15-6-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp6" + sku: "gen2" + sles-15-1-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp1-byos" + sku: "gen2" + sles-15-2-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp2-byos" + sku: "gen2" + sles-15-3-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp3-byos" + sku: "gen2" + sles-15-4-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp4-byos" + sku: "gen2" + sles-15-5-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp5-byos" + sku: "gen2" + sles-15-6-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp6-byos" + sku: "gen2" sap_vm_provision_msazure_vm_host_specifications_dictionary: diff --git a/deploy_scenarios/sap_s4hana_distributed_maintplan/ansible_playbook.yml b/deploy_scenarios/sap_s4hana_distributed_maintplan/ansible_playbook.yml index bb912b0..3890ceb 100644 --- a/deploy_scenarios/sap_s4hana_distributed_maintplan/ansible_playbook.yml +++ b/deploy_scenarios/sap_s4hana_distributed_maintplan/ansible_playbook.yml @@ -144,7 +144,6 @@ mode: '0755' loop: - "{{ sap_install_media_detect_source_directory }}" - - "{{ sap_hana_install_software_directory }}" - name: Install Python package manager pip3 to system Python ansible.builtin.package: diff --git a/deploy_scenarios/sap_s4hana_distributed_maintplan/ansible_requirements.yml b/deploy_scenarios/sap_s4hana_distributed_maintplan/ansible_requirements.yml index af7ed22..1454ec5 100644 --- a/deploy_scenarios/sap_s4hana_distributed_maintplan/ansible_requirements.yml +++ b/deploy_scenarios/sap_s4hana_distributed_maintplan/ansible_requirements.yml @@ -8,16 +8,16 @@ collections: version: 6.1.0 - name: fedora.linux_system_roles type: galaxy - version: 1.82.0 + version: 1.88.9 - name: community.sap_install type: galaxy - version: 1.4.0 + version: 1.5.0 - name: community.sap_launchpad type: galaxy - version: 1.1.0 + version: 1.1.1 - name: community.sap_infrastructure type: galaxy - version: 1.0.1 + version: 1.1.0 # - name: community.sap_operations # type: galaxy # version: 0.9.1 @@ -25,23 +25,23 @@ collections: # Collections for Infrastructure from Ansible Galaxy - name: cloud.terraform type: galaxy - version: 1.1.0 + version: 3.0.0 - name: amazon.aws type: galaxy - version: 7.2.0 + version: 9.0.0 - name: community.aws type: galaxy - version: 7.1.0 + version: 9.0.0 - name: azure.azcollection type: galaxy - version: 2.2.0 + version: 3.0.1 - name: google.cloud type: galaxy version: 1.1.3 # Replace with ibm.cloud in future, legacy Ansible Collection uses hidden on-the-fly Terraform files in /var/tmp/ansible/ibmcloud) - name: ibm.cloudcollection type: galaxy - version: 1.51.0 + version: 1.71.2 - name: ovirt.ovirt type: galaxy version: 3.1.2 @@ -53,21 +53,12 @@ collections: version: 3.0.0 - name: cloud.common type: galaxy - version: 3.0.0 + version: 4.0.0 # Collections from public repositories via HTTPS # - name: https://github.com/sap-linuxlab/community.sap_install.git # type: git # version: dev -# - name: https://github.com/sap-linuxlab/community.sap_launchpad.git -# type: git -# version: main -# - name: https://github.com/sap-linuxlab/community.sap_operations.git -# type: git -# version: main -# - name: https://github.com/ansible-collections/cloud.terraform.git -# type: git -# version: main # Collections from private repositories via use SSH (embedded GitHub PAT does not work) # Used for customised/forked Ansible Collections diff --git a/deploy_scenarios/sap_s4hana_distributed_maintplan/optional/ansible_extravars_noninteractive.yml b/deploy_scenarios/sap_s4hana_distributed_maintplan/optional/ansible_extravars_noninteractive.yml index 56eff1a..2f7a406 100755 --- a/deploy_scenarios/sap_s4hana_distributed_maintplan/optional/ansible_extravars_noninteractive.yml +++ b/deploy_scenarios/sap_s4hana_distributed_maintplan/optional/ansible_extravars_noninteractive.yml @@ -126,13 +126,14 @@ sap_vm_provision_nfs_mount_point_opts: nfsvers=4.1,sec=sys,_netdev,hard,timeo=60 #### sap_vm_provision_ibmcloud_api_key: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ibmcloud_resource_group_name: "ENTER_STRING_VALUE_HERE" # if ansible_to_terraform, use "new" -sap_vm_provision_ibmcloud_private_dns_instance_name: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_private_dns_instance_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform sap_vm_provision_ibmcloud_powervs_location: "ENTER_STRING_VALUE_HERE" -sap_vm_provision_ibmcloud_powervs_workspace_name: "ENTER_STRING_VALUE_HERE" -sap_vm_provision_ibmcloud_powervs_vlan_subnet_name: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_powervs_workspace_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform +sap_vm_provision_ibmcloud_powervs_vlan_subnet_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform sap_vm_provision_ibmcloud_powervs_host_os_image: "ENTER_STRING_VALUE_HERE" sap_vm_provision_bastion_user: "ENTER_STRING_VALUE_HERE" sap_vm_provision_bastion_ssh_port: "ENTER_STRING_VALUE_HERE" +# sap_vm_provision_ibmcloud_vpc_subnet_name: "ENTER_STRING_VALUE_HERE" # only for ansible_to_terraform, can be name or 'new' # Only for use when 'ansible' is value provided for variable sap_vm_provision_iac_type #### @@ -140,6 +141,7 @@ sap_vm_provision_bastion_public_ip: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ssh_bastion_private_key_file_path: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ssh_host_private_key_file_path: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ibmcloud_powervs_key_pair_name_ssh_host_public_key: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_private_dns_custom_resolver_ip: "ENTER_STRING_VALUE_HERE" # sap_vm_provision_ibmcloud_private_dns_resource_group_name: "" # optional, default use of sap_vm_provision_ibmcloud_resource_group_name sap_vm_provision_proxy_web_forward_proxy_ip: "ENTER_STRING_VALUE_HERE" # IP:Port only, no http:// prefix sap_vm_provision_proxy_web_forward_exclusions: "localhost,127.0.0.1,{{ sap_vm_provision_dns_root_domain }}" @@ -364,7 +366,7 @@ sap_id_user_password: 'ENTER_STRING_VALUE_HERE' sap_maintenance_planner_transaction_name: 'ENTER_STRING_VALUE_HERE' # Directory for SAP installation media -sap_software_download_directory: "ENTER_STRING_VALUE_HERE" +sap_install_media_detect_source_directory: "ENTER_STRING_VALUE_HERE" # e.g. /software #### diff --git a/deploy_scenarios/sap_s4hana_foundation_sandbox/ansible_extravars.yml b/deploy_scenarios/sap_s4hana_foundation_sandbox/ansible_extravars.yml index 5bea850..38c251c 100755 --- a/deploy_scenarios/sap_s4hana_foundation_sandbox/ansible_extravars.yml +++ b/deploy_scenarios/sap_s4hana_foundation_sandbox/ansible_extravars.yml @@ -386,27 +386,43 @@ sap_swpm_templates_install_dictionary: sap_vm_provision_aws_ec2_vs_host_os_image_dictionary: rhel-8-1: "*RHEL-8.1*_HVM*x86_64*" - rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" + # rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" # removed rhel-8-4: "*RHEL-8.4*_HVM*x86_64*" rhel-8-6: "*RHEL-8.6*_HVM*x86_64*" rhel-8-8: "*RHEL-8.8*_HVM*x86_64*" + rhel-8-10: "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0: "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1: "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2: "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3: "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4: "*RHEL-9.4*_HVM*x86_64*" + sles-12-5: "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" # removed + # sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" # removed + # sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" # removed + sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6: "*suse-sles-15-sp6-v202*-hvm-ssd-x86_64*" + # rhel-7-7-sap-ha: "*RHEL-SAP-8.1.0*" # removed + # rhel-7-9-sap-ha: "*RHEL-SAP-8.1.0*" # removed rhel-8-1-sap-ha: "*RHEL-SAP-8.1.0*" rhel-8-2-sap-ha: "*RHEL-SAP-8.2.0*" rhel-8-4-sap-ha: "*RHEL-SAP-8.4.0*" rhel-8-6-sap-ha: "*RHEL-SAP-8.6.0*" rhel-8-8-sap-ha: "*RHEL-SAP-8.8.0*" + rhel-8-10-sap-ha: "*RHEL-SAP-8.10.0*" rhel-9-0-sap-ha: "*RHEL-SAP-9.0.0*" rhel-9-2-sap-ha: "*RHEL-SAP-9.2.0*" - sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" - sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" - sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" - sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + rhel-9-4-sap-ha: "*RHEL-SAP-9.4.0*" sles-12-5-sap-ha: "*suse-sles-sap-12-sp5-v202*-hvm-ssd-x86_64*" sles-15-1-sap-ha: "*suse-sles-sap-15-sp1-v202*-hvm-ssd-x86_64*" sles-15-2-sap-ha: "*suse-sles-sap-15-sp2-v202*-hvm-ssd-x86_64*" sles-15-3-sap-ha: "*suse-sles-sap-15-sp3-v202*-hvm-ssd-x86_64*" sles-15-4-sap-ha: "*suse-sles-sap-15-sp4-v202*-hvm-ssd-x86_64*" sles-15-5-sap-ha: "*suse-sles-sap-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha: "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" + sles-15-4-sap-ha-byos: "*suse-sles-sap-15-sp4-byos-v202*-hvm-ssd-x86_64*" + sles-15-5-sap-ha-byos: "*suse-sles-sap-15-sp5-byos-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha-byos: "*suse-sles-sap-15-sp6-byos-v202*-hvm-ssd-x86_64*" sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: @@ -486,42 +502,75 @@ sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: #### sap_vm_provision_gcp_ce_vm_host_os_image_dictionary: - rhel-8-latest: project: "rhel-cloud" family: "rhel-8" - - rhel-8-1-sap-ha: + rhel-9-latest: + project: "rhel-cloud" + family: "rhel-9" + sles-12-latest: + project: "suse-cloud" + family: "sles-12" + sles-15-latest: + project: "suse-cloud" + family: "sles-15" + # rhel-7-7-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-7-7-sap-ha" + rhel-7-9-sap-ha: project: "rhel-sap-cloud" - family: "rhel-8-1-sap-ha" - + family: "rhel-7-9-sap-ha" + # rhel-8-1-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-8-1-sap-ha" rhel-8-2-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-2-sap-ha" - rhel-8-4-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-4-sap-ha" - rhel-8-6-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-6-sap-ha" - - sles-15-latest: - project: "suse-cloud" - family: "sles-15" - - sles-15-sp3-sap: + sles-12-5-sap-ha: + project: "suse-sap-cloud" + family: "sles-12-sp5-sap" + # sles-15-1-sap-ha: # removed + # project: "suse-sap-cloud" + # family: "sles-15-sp1-sap" + sles-15-2-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp2-sap" + sles-15-3-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp3-sap" - - sles-15-sp4-sap: + sles-15-4-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp4-sap" - - sles-15-sp5-sap: + sles-15-5-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp5-sap" + sles-15-6-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp6-sap" + sles-12-5-sap-ha-byos: + project: "suse-byos-cloud" + family: "sles-12-sp5-sap-byos" + sles-15-2-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp2-sap-byos" + sles-15-3-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp3-sap-byos" + sles-15-4-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp4-sap-byos" + sles-15-5-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp5-sap-byos" + sles-15-6-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp6-sap-byos" sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: @@ -599,16 +648,31 @@ sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: sap_vm_provision_ibmcloud_vs_host_os_image_dictionary: rhel-8-4: ".*redhat.*8-4.*minimal.*amd64.*" rhel-8-6: ".*redhat.*8-6.*minimal.*amd64.*" + rhel-8-8: ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10: ".*redhat.*8-10.*minimal.*amd64.*" rhel-9-0: ".*redhat.*9-0.*minimal.*amd64.*" rhel-9-2: ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4: ".*redhat.*9-4.*minimal.*amd64.*" + sles-15-5: ".*sles.*15-5.*amd64-[0-9]" + sles-15-6: ".*sles.*15-6.*amd64-[0-9]" + # rhel-7-6-sap-ha: ".*redhat.*7-6.*amd64.*hana.*" # retrievable from deprecated list + # rhel-7-9-sap-ha: ".*redhat.*7-9.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-1-sap-ha: ".*redhat.*8-1.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-2-sap-ha: ".*redhat.*8-2.*amd64.*hana.*" # retrievable from deprecated list rhel-8-4-sap-ha: ".*redhat.*8-4.*amd64.*hana.*" rhel-8-6-sap-ha: ".*redhat.*8-6.*amd64.*hana.*" rhel-8-8-sap-ha: ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha: ".*redhat.*8-10.*amd64.*hana.*" rhel-9-0-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" - rhel-9-2-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha: ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha: ".*redhat.*9-4.*amd64.*hana.*" + # sles-12-4-sap-ha: ".*sles.*12-4.*amd64.*hana.*" # retrievable from deprecated list + # sles-12-5-sap-ha: ".*sles.*12-5.*amd64.*hana.*" # retrievable from deprecated list + # sles-15-1-sap-ha: ".*sles.*15-1.*amd64.*hana.*" # retrievable from deprecated list sles-15-3-sap-ha: ".*sles.*15-3.*amd64.*hana.*" sles-15-4-sap-ha: ".*sles.*15-4.*amd64.*hana.*" sles-15-5-sap-ha: ".*sles.*15-5.*amd64.*hana.*" + sles-15-6-sap-ha: ".*sles.*15-6.*amd64.*hana.*" sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: @@ -697,17 +761,26 @@ sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: # Full Linux subscription ppc64le OS Images with support and activation keys sap_vm_provision_ibmcloud_powervs_host_os_image_dictionary: - rhel-8-4: ".*RHEL.*8.*4" - rhel-8-6: ".*RHEL.*8.*6" + rhel-8-8: ".*RHEL.*8.*8" rhel-9-2: ".*RHEL.*9.*2" - sles-15-3: ".*SLES.*15.*3" - sles-15-4: ".*SLES.*15.*4" + rhel-9-4: ".*RHEL.*9.*4" + sles-15-5: ".*SLES.*15.*5$" + rhel-8-4-sap-ha: "RHEL8-SP4-SAP" rhel-8-6-sap-ha: ".*RHEL.*8.*6.*SAP$" # ensure string suffix using $ rhel-8-8-sap-ha: ".*RHEL.*8.*8.*SAP$" # ensure string suffix using $ rhel-9-2-sap-ha: ".*RHEL.*9.*2.*SAP$" # ensure string suffix using $ sles-15-2-sap-ha: ".*SLES.*15.*2.*SAP$" # ensure string suffix using $ sles-15-3-sap-ha: ".*SLES.*15.*3.*SAP$" # ensure string suffix using $ sles-15-4-sap-ha: ".*SLES.*15.*4.*SAP$" # ensure string suffix using $ + sles-15-5-sap-ha: "SLES15-SP5-SAP" + # rhel-8-4-sap-ha-byol: "RHEL8-SP4-SAP-BYOL" + # rhel-8-6-sap-ha-byol: ".*RHEL.*8.*6.*SAP-BYOL$" # ensure string suffix using $ + # rhel-8-8-sap-ha-byol: ".*RHEL.*8.*8.*SAP-BYOL$" # ensure string suffix using $ + # rhel-9-2-sap-ha-byol: ".*RHEL.*9.*2.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-2-sap-ha-byol: ".*SLES.*15.*2.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-3-sap-ha-byol: ".*SLES.*15.*3.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-4-sap-ha-byol: ".*SLES.*15.*4.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-5-sap-ha-byol: "SLES15-SP5-SAP-BYOL" sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: @@ -767,7 +840,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: # See SAP Note 1597355 - Swap-space recommendation for Linux - name: swap # sbx disk_size: 96 - disk_type: tier3 + disk_type: tier1 filesystem_type: swap # must be swap filesystem - name: software @@ -783,96 +856,186 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: #### sap_vm_provision_msazure_vm_host_os_image_dictionary: - + rhel-8-0: + publisher: "RedHat" + offer: "RHEL" + sku: "8-gen2" + rhel-8-1: + publisher: "RedHat" + offer: "RHEL" + sku: "81-gen2" + rhel-8-2: + publisher: "RedHat" + offer: "RHEL" + sku: "82-gen2" + rhel-8-3: + publisher: "RedHat" + offer: "RHEL" + sku: "83-gen2" rhel-8-4: publisher: "RedHat" offer: "RHEL" sku: "84-gen2" - + rhel-8-5: + publisher: "RedHat" + offer: "RHEL" + sku: "85-gen2" + rhel-8-6: + publisher: "RedHat" + offer: "RHEL" + sku: "86-gen2" + rhel-8-7: + publisher: "RedHat" + offer: "RHEL" + sku: "87-gen2" + rhel-8-8: + publisher: "RedHat" + offer: "RHEL" + sku: "88-gen2" + rhel-8-9: + publisher: "RedHat" + offer: "RHEL" + sku: "89-gen2" + rhel-8-10: + publisher: "RedHat" + offer: "RHEL" + sku: "810-gen2" + rhel-9-0: + publisher: "RedHat" + offer: "RHEL" + sku: "90-gen2" + rhel-9-1: + publisher: "RedHat" + offer: "RHEL" + sku: "91-gen2" + rhel-9-2: + publisher: "RedHat" + offer: "RHEL" + sku: "92-gen2" + rhel-9-3: + publisher: "RedHat" + offer: "RHEL" + sku: "93-gen2" + rhel-9-4: + publisher: "RedHat" + offer: "RHEL" + sku: "94-gen2" + sles-12-5: + publisher: "SUSE" + offer: "sles-12-sp5" + sku: "gen2" + sles-15-1: + publisher: "SUSE" + offer: "sles-15-sp1" + sku: "gen2" + sles-15-2: + publisher: "SUSE" + offer: "sles-15-sp2" + sku: "gen2" + sles-15-3: + publisher: "SUSE" + offer: "sles-15-sp3" + sku: "gen2" + sles-15-4: + publisher: "SUSE" + offer: "sles-15-sp4" + sku: "gen2" + sles-15-5: + publisher: "SUSE" + offer: "sles-15-sp5" + sku: "gen2" + sles-15-6: + publisher: "SUSE" + offer: "sles-15-sp6" + sku: "gen2" rhel-8-1-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "81sapha-gen2" - rhel-8-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "82sapha-gen2" - rhel-8-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "84sapha-gen2" - rhel-8-6-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "86sapha-gen2" - rhel-8-8-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "88sapha-gen2" - + rhel-8-10-sap-ha: + publisher: "RedHat" + offer: "RHEL-SAP-HA" + sku: "810sapha-gen2" rhel-9-0-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "90sapha-gen2" - rhel-9-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "92sapha-gen2" - - rhel-8-1-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "81sapapps-gen2" - - rhel-8-2-sap-applications: + rhel-9-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" - sku: "82sapapps-gen2" - - rhel-8-4-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "84sapapps-gen2" - - rhel-8-6-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "86sapapps-gen2" - - rhel-8-8-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "88sapapps-gen2" - - rhel-9-0-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "90sapapps-gen2" - - rhel-9-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "92sapapps-gen2" - - sles-15-sp3-sap: + sku: "94sapha-gen2" + sles-12-5-sap-ha: + publisher: "SUSE" + offer: "sles-sap-12-sp5" + sku: "gen2" + sles-15-1-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp1" + sku: "gen2" + sles-15-2-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp2" + sku: "gen2" + sles-15-3-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp3" sku: "gen2" - - sles-15-sp4-sap: + sles-15-4-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp4" sku: "gen2" - - sles-15-sp5-sap: + sles-15-5-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp5" sku: "gen2" + sles-15-6-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp6" + sku: "gen2" + sles-15-1-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp1-byos" + sku: "gen2" + sles-15-2-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp2-byos" + sku: "gen2" + sles-15-3-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp3-byos" + sku: "gen2" + sles-15-4-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp4-byos" + sku: "gen2" + sles-15-5-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp5-byos" + sku: "gen2" + sles-15-6-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp6-byos" + sku: "gen2" sap_vm_provision_msazure_vm_host_specifications_dictionary: diff --git a/deploy_scenarios/sap_s4hana_foundation_sandbox/ansible_playbook.yml b/deploy_scenarios/sap_s4hana_foundation_sandbox/ansible_playbook.yml index dad4307..9faaa0a 100644 --- a/deploy_scenarios/sap_s4hana_foundation_sandbox/ansible_playbook.yml +++ b/deploy_scenarios/sap_s4hana_foundation_sandbox/ansible_playbook.yml @@ -129,7 +129,6 @@ mode: '0755' loop: - "{{ sap_install_media_detect_source_directory }}" - - "{{ sap_hana_install_software_directory }}" - name: Install Python package manager pip3 to system Python ansible.builtin.package: diff --git a/deploy_scenarios/sap_s4hana_foundation_sandbox/ansible_requirements.yml b/deploy_scenarios/sap_s4hana_foundation_sandbox/ansible_requirements.yml index af7ed22..1454ec5 100644 --- a/deploy_scenarios/sap_s4hana_foundation_sandbox/ansible_requirements.yml +++ b/deploy_scenarios/sap_s4hana_foundation_sandbox/ansible_requirements.yml @@ -8,16 +8,16 @@ collections: version: 6.1.0 - name: fedora.linux_system_roles type: galaxy - version: 1.82.0 + version: 1.88.9 - name: community.sap_install type: galaxy - version: 1.4.0 + version: 1.5.0 - name: community.sap_launchpad type: galaxy - version: 1.1.0 + version: 1.1.1 - name: community.sap_infrastructure type: galaxy - version: 1.0.1 + version: 1.1.0 # - name: community.sap_operations # type: galaxy # version: 0.9.1 @@ -25,23 +25,23 @@ collections: # Collections for Infrastructure from Ansible Galaxy - name: cloud.terraform type: galaxy - version: 1.1.0 + version: 3.0.0 - name: amazon.aws type: galaxy - version: 7.2.0 + version: 9.0.0 - name: community.aws type: galaxy - version: 7.1.0 + version: 9.0.0 - name: azure.azcollection type: galaxy - version: 2.2.0 + version: 3.0.1 - name: google.cloud type: galaxy version: 1.1.3 # Replace with ibm.cloud in future, legacy Ansible Collection uses hidden on-the-fly Terraform files in /var/tmp/ansible/ibmcloud) - name: ibm.cloudcollection type: galaxy - version: 1.51.0 + version: 1.71.2 - name: ovirt.ovirt type: galaxy version: 3.1.2 @@ -53,21 +53,12 @@ collections: version: 3.0.0 - name: cloud.common type: galaxy - version: 3.0.0 + version: 4.0.0 # Collections from public repositories via HTTPS # - name: https://github.com/sap-linuxlab/community.sap_install.git # type: git # version: dev -# - name: https://github.com/sap-linuxlab/community.sap_launchpad.git -# type: git -# version: main -# - name: https://github.com/sap-linuxlab/community.sap_operations.git -# type: git -# version: main -# - name: https://github.com/ansible-collections/cloud.terraform.git -# type: git -# version: main # Collections from private repositories via use SSH (embedded GitHub PAT does not work) # Used for customised/forked Ansible Collections diff --git a/deploy_scenarios/sap_s4hana_foundation_sandbox/optional/ansible_extravars_noninteractive.yml b/deploy_scenarios/sap_s4hana_foundation_sandbox/optional/ansible_extravars_noninteractive.yml index 9d1698a..1fe4992 100755 --- a/deploy_scenarios/sap_s4hana_foundation_sandbox/optional/ansible_extravars_noninteractive.yml +++ b/deploy_scenarios/sap_s4hana_foundation_sandbox/optional/ansible_extravars_noninteractive.yml @@ -113,13 +113,14 @@ sap_vm_provision_ibmcloud_vpc_sg_names: "ENTER_STRING_VALUE_HERE,ENTER_STRING_VA #### sap_vm_provision_ibmcloud_api_key: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ibmcloud_resource_group_name: "ENTER_STRING_VALUE_HERE" # if ansible_to_terraform, use "new" -sap_vm_provision_ibmcloud_private_dns_instance_name: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_private_dns_instance_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform sap_vm_provision_ibmcloud_powervs_location: "ENTER_STRING_VALUE_HERE" -sap_vm_provision_ibmcloud_powervs_workspace_name: "ENTER_STRING_VALUE_HERE" -sap_vm_provision_ibmcloud_powervs_vlan_subnet_name: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_powervs_workspace_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform +sap_vm_provision_ibmcloud_powervs_vlan_subnet_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform sap_vm_provision_ibmcloud_powervs_host_os_image: "ENTER_STRING_VALUE_HERE" sap_vm_provision_bastion_user: "ENTER_STRING_VALUE_HERE" sap_vm_provision_bastion_ssh_port: "ENTER_STRING_VALUE_HERE" +# sap_vm_provision_ibmcloud_vpc_subnet_name: "ENTER_STRING_VALUE_HERE" # only for ansible_to_terraform, can be name or 'new' # Only for use when 'ansible' is value provided for variable sap_vm_provision_iac_type #### @@ -127,6 +128,7 @@ sap_vm_provision_bastion_public_ip: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ssh_bastion_private_key_file_path: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ssh_host_private_key_file_path: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ibmcloud_powervs_key_pair_name_ssh_host_public_key: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_private_dns_custom_resolver_ip: "ENTER_STRING_VALUE_HERE" # sap_vm_provision_ibmcloud_private_dns_resource_group_name: "" # optional, default use of sap_vm_provision_ibmcloud_resource_group_name sap_vm_provision_proxy_web_forward_proxy_ip: "ENTER_STRING_VALUE_HERE" # IP:Port only, no http:// prefix sap_vm_provision_proxy_web_forward_exclusions: "localhost,127.0.0.1,{{ sap_vm_provision_dns_root_domain }}" @@ -328,7 +330,7 @@ sap_id_user: "ENTER_STRING_VALUE_HERE" sap_id_user_password: 'ENTER_STRING_VALUE_HERE' # Directory for SAP installation media -sap_software_download_directory: "ENTER_STRING_VALUE_HERE" +sap_install_media_detect_source_directory: "ENTER_STRING_VALUE_HERE" # e.g. /software #### diff --git a/deploy_scenarios/sap_s4hana_foundation_standard/ansible_extravars.yml b/deploy_scenarios/sap_s4hana_foundation_standard/ansible_extravars.yml index df8f118..5783474 100755 --- a/deploy_scenarios/sap_s4hana_foundation_standard/ansible_extravars.yml +++ b/deploy_scenarios/sap_s4hana_foundation_standard/ansible_extravars.yml @@ -419,27 +419,43 @@ sap_swpm_templates_install_dictionary: sap_vm_provision_aws_ec2_vs_host_os_image_dictionary: rhel-8-1: "*RHEL-8.1*_HVM*x86_64*" - rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" + # rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" # removed rhel-8-4: "*RHEL-8.4*_HVM*x86_64*" rhel-8-6: "*RHEL-8.6*_HVM*x86_64*" rhel-8-8: "*RHEL-8.8*_HVM*x86_64*" + rhel-8-10: "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0: "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1: "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2: "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3: "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4: "*RHEL-9.4*_HVM*x86_64*" + sles-12-5: "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" # removed + # sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" # removed + # sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" # removed + sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6: "*suse-sles-15-sp6-v202*-hvm-ssd-x86_64*" + # rhel-7-7-sap-ha: "*RHEL-SAP-8.1.0*" # removed + # rhel-7-9-sap-ha: "*RHEL-SAP-8.1.0*" # removed rhel-8-1-sap-ha: "*RHEL-SAP-8.1.0*" rhel-8-2-sap-ha: "*RHEL-SAP-8.2.0*" rhel-8-4-sap-ha: "*RHEL-SAP-8.4.0*" rhel-8-6-sap-ha: "*RHEL-SAP-8.6.0*" rhel-8-8-sap-ha: "*RHEL-SAP-8.8.0*" + rhel-8-10-sap-ha: "*RHEL-SAP-8.10.0*" rhel-9-0-sap-ha: "*RHEL-SAP-9.0.0*" rhel-9-2-sap-ha: "*RHEL-SAP-9.2.0*" - sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" - sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" - sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" - sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + rhel-9-4-sap-ha: "*RHEL-SAP-9.4.0*" sles-12-5-sap-ha: "*suse-sles-sap-12-sp5-v202*-hvm-ssd-x86_64*" sles-15-1-sap-ha: "*suse-sles-sap-15-sp1-v202*-hvm-ssd-x86_64*" sles-15-2-sap-ha: "*suse-sles-sap-15-sp2-v202*-hvm-ssd-x86_64*" sles-15-3-sap-ha: "*suse-sles-sap-15-sp3-v202*-hvm-ssd-x86_64*" sles-15-4-sap-ha: "*suse-sles-sap-15-sp4-v202*-hvm-ssd-x86_64*" sles-15-5-sap-ha: "*suse-sles-sap-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha: "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" + sles-15-4-sap-ha-byos: "*suse-sles-sap-15-sp4-byos-v202*-hvm-ssd-x86_64*" + sles-15-5-sap-ha-byos: "*suse-sles-sap-15-sp5-byos-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha-byos: "*suse-sles-sap-15-sp6-byos-v202*-hvm-ssd-x86_64*" sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: @@ -543,42 +559,75 @@ sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: #### sap_vm_provision_gcp_ce_vm_host_os_image_dictionary: - rhel-8-latest: project: "rhel-cloud" family: "rhel-8" - - rhel-8-1-sap-ha: + rhel-9-latest: + project: "rhel-cloud" + family: "rhel-9" + sles-12-latest: + project: "suse-cloud" + family: "sles-12" + sles-15-latest: + project: "suse-cloud" + family: "sles-15" + # rhel-7-7-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-7-7-sap-ha" + rhel-7-9-sap-ha: project: "rhel-sap-cloud" - family: "rhel-8-1-sap-ha" - + family: "rhel-7-9-sap-ha" + # rhel-8-1-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-8-1-sap-ha" rhel-8-2-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-2-sap-ha" - rhel-8-4-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-4-sap-ha" - rhel-8-6-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-6-sap-ha" - - sles-15-latest: - project: "suse-cloud" - family: "sles-15" - - sles-15-sp3-sap: + sles-12-5-sap-ha: + project: "suse-sap-cloud" + family: "sles-12-sp5-sap" + # sles-15-1-sap-ha: # removed + # project: "suse-sap-cloud" + # family: "sles-15-sp1-sap" + sles-15-2-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp2-sap" + sles-15-3-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp3-sap" - - sles-15-sp4-sap: + sles-15-4-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp4-sap" - - sles-15-sp5-sap: + sles-15-5-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp5-sap" + sles-15-6-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp6-sap" + sles-12-5-sap-ha-byos: + project: "suse-byos-cloud" + family: "sles-12-sp5-sap-byos" + sles-15-2-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp2-sap-byos" + sles-15-3-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp3-sap-byos" + sles-15-4-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp4-sap-byos" + sles-15-5-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp5-sap-byos" + sles-15-6-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp6-sap-byos" sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: @@ -692,16 +741,31 @@ sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: sap_vm_provision_ibmcloud_vs_host_os_image_dictionary: rhel-8-4: ".*redhat.*8-4.*minimal.*amd64.*" rhel-8-6: ".*redhat.*8-6.*minimal.*amd64.*" + rhel-8-8: ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10: ".*redhat.*8-10.*minimal.*amd64.*" rhel-9-0: ".*redhat.*9-0.*minimal.*amd64.*" rhel-9-2: ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4: ".*redhat.*9-4.*minimal.*amd64.*" + sles-15-5: ".*sles.*15-5.*amd64-[0-9]" + sles-15-6: ".*sles.*15-6.*amd64-[0-9]" + # rhel-7-6-sap-ha: ".*redhat.*7-6.*amd64.*hana.*" # retrievable from deprecated list + # rhel-7-9-sap-ha: ".*redhat.*7-9.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-1-sap-ha: ".*redhat.*8-1.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-2-sap-ha: ".*redhat.*8-2.*amd64.*hana.*" # retrievable from deprecated list rhel-8-4-sap-ha: ".*redhat.*8-4.*amd64.*hana.*" rhel-8-6-sap-ha: ".*redhat.*8-6.*amd64.*hana.*" rhel-8-8-sap-ha: ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha: ".*redhat.*8-10.*amd64.*hana.*" rhel-9-0-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" - rhel-9-2-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha: ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha: ".*redhat.*9-4.*amd64.*hana.*" + # sles-12-4-sap-ha: ".*sles.*12-4.*amd64.*hana.*" # retrievable from deprecated list + # sles-12-5-sap-ha: ".*sles.*12-5.*amd64.*hana.*" # retrievable from deprecated list + # sles-15-1-sap-ha: ".*sles.*15-1.*amd64.*hana.*" # retrievable from deprecated list sles-15-3-sap-ha: ".*sles.*15-3.*amd64.*hana.*" sles-15-4-sap-ha: ".*sles.*15-4.*amd64.*hana.*" sles-15-5-sap-ha: ".*sles.*15-5.*amd64.*hana.*" + sles-15-6-sap-ha: ".*sles.*15-6.*amd64.*hana.*" sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: @@ -814,17 +878,26 @@ sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: # Full Linux subscription ppc64le OS Images with support and activation keys sap_vm_provision_ibmcloud_powervs_host_os_image_dictionary: - rhel-8-4: ".*RHEL.*8.*4" - rhel-8-6: ".*RHEL.*8.*6" + rhel-8-8: ".*RHEL.*8.*8" rhel-9-2: ".*RHEL.*9.*2" - sles-15-3: ".*SLES.*15.*3" - sles-15-4: ".*SLES.*15.*4" + rhel-9-4: ".*RHEL.*9.*4" + sles-15-5: ".*SLES.*15.*5$" + rhel-8-4-sap-ha: "RHEL8-SP4-SAP" rhel-8-6-sap-ha: ".*RHEL.*8.*6.*SAP$" # ensure string suffix using $ rhel-8-8-sap-ha: ".*RHEL.*8.*8.*SAP$" # ensure string suffix using $ rhel-9-2-sap-ha: ".*RHEL.*9.*2.*SAP$" # ensure string suffix using $ sles-15-2-sap-ha: ".*SLES.*15.*2.*SAP$" # ensure string suffix using $ sles-15-3-sap-ha: ".*SLES.*15.*3.*SAP$" # ensure string suffix using $ sles-15-4-sap-ha: ".*SLES.*15.*4.*SAP$" # ensure string suffix using $ + sles-15-5-sap-ha: "SLES15-SP5-SAP" + # rhel-8-4-sap-ha-byol: "RHEL8-SP4-SAP-BYOL" + # rhel-8-6-sap-ha-byol: ".*RHEL.*8.*6.*SAP-BYOL$" # ensure string suffix using $ + # rhel-8-8-sap-ha-byol: ".*RHEL.*8.*8.*SAP-BYOL$" # ensure string suffix using $ + # rhel-9-2-sap-ha-byol: ".*RHEL.*9.*2.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-2-sap-ha-byol: ".*SLES.*15.*2.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-3-sap-ha-byol: ".*SLES.*15.*3.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-4-sap-ha-byol: ".*SLES.*15.*4.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-5-sap-ha-byol: "SLES15-SP5-SAP-BYOL" sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: @@ -882,7 +955,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: - name: swap # hdb swap_path: /swapfile # use swap file on root disk, instead of creating LVM LV for swap disk_size: 2 - disk_type: tier3 + disk_type: tier1 filesystem_type: swap # must be swap filesystem - name: software @@ -938,96 +1011,186 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: #### sap_vm_provision_msazure_vm_host_os_image_dictionary: - + rhel-8-0: + publisher: "RedHat" + offer: "RHEL" + sku: "8-gen2" + rhel-8-1: + publisher: "RedHat" + offer: "RHEL" + sku: "81-gen2" + rhel-8-2: + publisher: "RedHat" + offer: "RHEL" + sku: "82-gen2" + rhel-8-3: + publisher: "RedHat" + offer: "RHEL" + sku: "83-gen2" rhel-8-4: publisher: "RedHat" offer: "RHEL" sku: "84-gen2" - + rhel-8-5: + publisher: "RedHat" + offer: "RHEL" + sku: "85-gen2" + rhel-8-6: + publisher: "RedHat" + offer: "RHEL" + sku: "86-gen2" + rhel-8-7: + publisher: "RedHat" + offer: "RHEL" + sku: "87-gen2" + rhel-8-8: + publisher: "RedHat" + offer: "RHEL" + sku: "88-gen2" + rhel-8-9: + publisher: "RedHat" + offer: "RHEL" + sku: "89-gen2" + rhel-8-10: + publisher: "RedHat" + offer: "RHEL" + sku: "810-gen2" + rhel-9-0: + publisher: "RedHat" + offer: "RHEL" + sku: "90-gen2" + rhel-9-1: + publisher: "RedHat" + offer: "RHEL" + sku: "91-gen2" + rhel-9-2: + publisher: "RedHat" + offer: "RHEL" + sku: "92-gen2" + rhel-9-3: + publisher: "RedHat" + offer: "RHEL" + sku: "93-gen2" + rhel-9-4: + publisher: "RedHat" + offer: "RHEL" + sku: "94-gen2" + sles-12-5: + publisher: "SUSE" + offer: "sles-12-sp5" + sku: "gen2" + sles-15-1: + publisher: "SUSE" + offer: "sles-15-sp1" + sku: "gen2" + sles-15-2: + publisher: "SUSE" + offer: "sles-15-sp2" + sku: "gen2" + sles-15-3: + publisher: "SUSE" + offer: "sles-15-sp3" + sku: "gen2" + sles-15-4: + publisher: "SUSE" + offer: "sles-15-sp4" + sku: "gen2" + sles-15-5: + publisher: "SUSE" + offer: "sles-15-sp5" + sku: "gen2" + sles-15-6: + publisher: "SUSE" + offer: "sles-15-sp6" + sku: "gen2" rhel-8-1-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "81sapha-gen2" - rhel-8-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "82sapha-gen2" - rhel-8-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "84sapha-gen2" - rhel-8-6-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "86sapha-gen2" - rhel-8-8-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "88sapha-gen2" - + rhel-8-10-sap-ha: + publisher: "RedHat" + offer: "RHEL-SAP-HA" + sku: "810sapha-gen2" rhel-9-0-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "90sapha-gen2" - rhel-9-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "92sapha-gen2" - - rhel-8-1-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "81sapapps-gen2" - - rhel-8-2-sap-applications: + rhel-9-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" - sku: "82sapapps-gen2" - - rhel-8-4-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "84sapapps-gen2" - - rhel-8-6-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "86sapapps-gen2" - - rhel-8-8-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "88sapapps-gen2" - - rhel-9-0-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "90sapapps-gen2" - - rhel-9-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "92sapapps-gen2" - - sles-15-sp3-sap: + sku: "94sapha-gen2" + sles-12-5-sap-ha: + publisher: "SUSE" + offer: "sles-sap-12-sp5" + sku: "gen2" + sles-15-1-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp1" + sku: "gen2" + sles-15-2-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp2" + sku: "gen2" + sles-15-3-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp3" sku: "gen2" - - sles-15-sp4-sap: + sles-15-4-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp4" sku: "gen2" - - sles-15-sp5-sap: + sles-15-5-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp5" sku: "gen2" + sles-15-6-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp6" + sku: "gen2" + sles-15-1-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp1-byos" + sku: "gen2" + sles-15-2-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp2-byos" + sku: "gen2" + sles-15-3-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp3-byos" + sku: "gen2" + sles-15-4-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp4-byos" + sku: "gen2" + sles-15-5-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp5-byos" + sku: "gen2" + sles-15-6-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp6-byos" + sku: "gen2" sap_vm_provision_msazure_vm_host_specifications_dictionary: diff --git a/deploy_scenarios/sap_s4hana_foundation_standard/ansible_playbook.yml b/deploy_scenarios/sap_s4hana_foundation_standard/ansible_playbook.yml index f6aada9..8215117 100644 --- a/deploy_scenarios/sap_s4hana_foundation_standard/ansible_playbook.yml +++ b/deploy_scenarios/sap_s4hana_foundation_standard/ansible_playbook.yml @@ -144,7 +144,6 @@ mode: '0755' loop: - "{{ sap_install_media_detect_source_directory }}" - - "{{ sap_hana_install_software_directory }}" - name: Install Python package manager pip3 to system Python ansible.builtin.package: diff --git a/deploy_scenarios/sap_s4hana_foundation_standard/ansible_requirements.yml b/deploy_scenarios/sap_s4hana_foundation_standard/ansible_requirements.yml index af7ed22..1454ec5 100644 --- a/deploy_scenarios/sap_s4hana_foundation_standard/ansible_requirements.yml +++ b/deploy_scenarios/sap_s4hana_foundation_standard/ansible_requirements.yml @@ -8,16 +8,16 @@ collections: version: 6.1.0 - name: fedora.linux_system_roles type: galaxy - version: 1.82.0 + version: 1.88.9 - name: community.sap_install type: galaxy - version: 1.4.0 + version: 1.5.0 - name: community.sap_launchpad type: galaxy - version: 1.1.0 + version: 1.1.1 - name: community.sap_infrastructure type: galaxy - version: 1.0.1 + version: 1.1.0 # - name: community.sap_operations # type: galaxy # version: 0.9.1 @@ -25,23 +25,23 @@ collections: # Collections for Infrastructure from Ansible Galaxy - name: cloud.terraform type: galaxy - version: 1.1.0 + version: 3.0.0 - name: amazon.aws type: galaxy - version: 7.2.0 + version: 9.0.0 - name: community.aws type: galaxy - version: 7.1.0 + version: 9.0.0 - name: azure.azcollection type: galaxy - version: 2.2.0 + version: 3.0.1 - name: google.cloud type: galaxy version: 1.1.3 # Replace with ibm.cloud in future, legacy Ansible Collection uses hidden on-the-fly Terraform files in /var/tmp/ansible/ibmcloud) - name: ibm.cloudcollection type: galaxy - version: 1.51.0 + version: 1.71.2 - name: ovirt.ovirt type: galaxy version: 3.1.2 @@ -53,21 +53,12 @@ collections: version: 3.0.0 - name: cloud.common type: galaxy - version: 3.0.0 + version: 4.0.0 # Collections from public repositories via HTTPS # - name: https://github.com/sap-linuxlab/community.sap_install.git # type: git # version: dev -# - name: https://github.com/sap-linuxlab/community.sap_launchpad.git -# type: git -# version: main -# - name: https://github.com/sap-linuxlab/community.sap_operations.git -# type: git -# version: main -# - name: https://github.com/ansible-collections/cloud.terraform.git -# type: git -# version: main # Collections from private repositories via use SSH (embedded GitHub PAT does not work) # Used for customised/forked Ansible Collections diff --git a/deploy_scenarios/sap_s4hana_foundation_standard/optional/ansible_extravars_noninteractive.yml b/deploy_scenarios/sap_s4hana_foundation_standard/optional/ansible_extravars_noninteractive.yml index db59cb4..ac0ebb7 100755 --- a/deploy_scenarios/sap_s4hana_foundation_standard/optional/ansible_extravars_noninteractive.yml +++ b/deploy_scenarios/sap_s4hana_foundation_standard/optional/ansible_extravars_noninteractive.yml @@ -113,13 +113,14 @@ sap_vm_provision_ibmcloud_vpc_sg_names: "ENTER_STRING_VALUE_HERE,ENTER_STRING_VA #### sap_vm_provision_ibmcloud_api_key: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ibmcloud_resource_group_name: "ENTER_STRING_VALUE_HERE" # if ansible_to_terraform, use "new" -sap_vm_provision_ibmcloud_private_dns_instance_name: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_private_dns_instance_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform sap_vm_provision_ibmcloud_powervs_location: "ENTER_STRING_VALUE_HERE" -sap_vm_provision_ibmcloud_powervs_workspace_name: "ENTER_STRING_VALUE_HERE" -sap_vm_provision_ibmcloud_powervs_vlan_subnet_name: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_powervs_workspace_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform +sap_vm_provision_ibmcloud_powervs_vlan_subnet_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform sap_vm_provision_ibmcloud_powervs_host_os_image: "ENTER_STRING_VALUE_HERE" sap_vm_provision_bastion_user: "ENTER_STRING_VALUE_HERE" sap_vm_provision_bastion_ssh_port: "ENTER_STRING_VALUE_HERE" +# sap_vm_provision_ibmcloud_vpc_subnet_name: "ENTER_STRING_VALUE_HERE" # only for ansible_to_terraform, can be name or 'new' # Only for use when 'ansible' is value provided for variable sap_vm_provision_iac_type #### @@ -127,6 +128,7 @@ sap_vm_provision_bastion_public_ip: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ssh_bastion_private_key_file_path: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ssh_host_private_key_file_path: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ibmcloud_powervs_key_pair_name_ssh_host_public_key: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_private_dns_custom_resolver_ip: "ENTER_STRING_VALUE_HERE" # sap_vm_provision_ibmcloud_private_dns_resource_group_name: "" # optional, default use of sap_vm_provision_ibmcloud_resource_group_name sap_vm_provision_proxy_web_forward_proxy_ip: "ENTER_STRING_VALUE_HERE" # IP:Port only, no http:// prefix sap_vm_provision_proxy_web_forward_exclusions: "localhost,127.0.0.1,{{ sap_vm_provision_dns_root_domain }}" @@ -361,7 +363,7 @@ sap_id_user: "ENTER_STRING_VALUE_HERE" sap_id_user_password: 'ENTER_STRING_VALUE_HERE' # Directory for SAP installation media -sap_software_download_directory: "ENTER_STRING_VALUE_HERE" +sap_install_media_detect_source_directory: "ENTER_STRING_VALUE_HERE" # e.g. /software #### diff --git a/deploy_scenarios/sap_s4hana_sandbox/ansible_extravars.yml b/deploy_scenarios/sap_s4hana_sandbox/ansible_extravars.yml index ab75cfb..43c25c7 100755 --- a/deploy_scenarios/sap_s4hana_sandbox/ansible_extravars.yml +++ b/deploy_scenarios/sap_s4hana_sandbox/ansible_extravars.yml @@ -741,27 +741,43 @@ sap_swpm_templates_install_dictionary: sap_vm_provision_aws_ec2_vs_host_os_image_dictionary: rhel-8-1: "*RHEL-8.1*_HVM*x86_64*" - rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" + # rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" # removed rhel-8-4: "*RHEL-8.4*_HVM*x86_64*" rhel-8-6: "*RHEL-8.6*_HVM*x86_64*" rhel-8-8: "*RHEL-8.8*_HVM*x86_64*" + rhel-8-10: "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0: "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1: "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2: "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3: "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4: "*RHEL-9.4*_HVM*x86_64*" + sles-12-5: "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" # removed + # sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" # removed + # sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" # removed + sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6: "*suse-sles-15-sp6-v202*-hvm-ssd-x86_64*" + # rhel-7-7-sap-ha: "*RHEL-SAP-8.1.0*" # removed + # rhel-7-9-sap-ha: "*RHEL-SAP-8.1.0*" # removed rhel-8-1-sap-ha: "*RHEL-SAP-8.1.0*" rhel-8-2-sap-ha: "*RHEL-SAP-8.2.0*" rhel-8-4-sap-ha: "*RHEL-SAP-8.4.0*" rhel-8-6-sap-ha: "*RHEL-SAP-8.6.0*" rhel-8-8-sap-ha: "*RHEL-SAP-8.8.0*" + rhel-8-10-sap-ha: "*RHEL-SAP-8.10.0*" rhel-9-0-sap-ha: "*RHEL-SAP-9.0.0*" rhel-9-2-sap-ha: "*RHEL-SAP-9.2.0*" - sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" - sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" - sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" - sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + rhel-9-4-sap-ha: "*RHEL-SAP-9.4.0*" sles-12-5-sap-ha: "*suse-sles-sap-12-sp5-v202*-hvm-ssd-x86_64*" sles-15-1-sap-ha: "*suse-sles-sap-15-sp1-v202*-hvm-ssd-x86_64*" sles-15-2-sap-ha: "*suse-sles-sap-15-sp2-v202*-hvm-ssd-x86_64*" sles-15-3-sap-ha: "*suse-sles-sap-15-sp3-v202*-hvm-ssd-x86_64*" sles-15-4-sap-ha: "*suse-sles-sap-15-sp4-v202*-hvm-ssd-x86_64*" sles-15-5-sap-ha: "*suse-sles-sap-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha: "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" + sles-15-4-sap-ha-byos: "*suse-sles-sap-15-sp4-byos-v202*-hvm-ssd-x86_64*" + sles-15-5-sap-ha-byos: "*suse-sles-sap-15-sp5-byos-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha-byos: "*suse-sles-sap-15-sp6-byos-v202*-hvm-ssd-x86_64*" sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: @@ -841,42 +857,75 @@ sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: #### sap_vm_provision_gcp_ce_vm_host_os_image_dictionary: - rhel-8-latest: project: "rhel-cloud" family: "rhel-8" - - rhel-8-1-sap-ha: + rhel-9-latest: + project: "rhel-cloud" + family: "rhel-9" + sles-12-latest: + project: "suse-cloud" + family: "sles-12" + sles-15-latest: + project: "suse-cloud" + family: "sles-15" + # rhel-7-7-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-7-7-sap-ha" + rhel-7-9-sap-ha: project: "rhel-sap-cloud" - family: "rhel-8-1-sap-ha" - + family: "rhel-7-9-sap-ha" + # rhel-8-1-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-8-1-sap-ha" rhel-8-2-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-2-sap-ha" - rhel-8-4-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-4-sap-ha" - rhel-8-6-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-6-sap-ha" - - sles-15-latest: - project: "suse-cloud" - family: "sles-15" - - sles-15-sp3-sap: + sles-12-5-sap-ha: + project: "suse-sap-cloud" + family: "sles-12-sp5-sap" + # sles-15-1-sap-ha: # removed + # project: "suse-sap-cloud" + # family: "sles-15-sp1-sap" + sles-15-2-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp2-sap" + sles-15-3-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp3-sap" - - sles-15-sp4-sap: + sles-15-4-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp4-sap" - - sles-15-sp5-sap: + sles-15-5-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp5-sap" + sles-15-6-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp6-sap" + sles-12-5-sap-ha-byos: + project: "suse-byos-cloud" + family: "sles-12-sp5-sap-byos" + sles-15-2-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp2-sap-byos" + sles-15-3-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp3-sap-byos" + sles-15-4-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp4-sap-byos" + sles-15-5-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp5-sap-byos" + sles-15-6-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp6-sap-byos" sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: @@ -954,16 +1003,31 @@ sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: sap_vm_provision_ibmcloud_vs_host_os_image_dictionary: rhel-8-4: ".*redhat.*8-4.*minimal.*amd64.*" rhel-8-6: ".*redhat.*8-6.*minimal.*amd64.*" + rhel-8-8: ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10: ".*redhat.*8-10.*minimal.*amd64.*" rhel-9-0: ".*redhat.*9-0.*minimal.*amd64.*" rhel-9-2: ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4: ".*redhat.*9-4.*minimal.*amd64.*" + sles-15-5: ".*sles.*15-5.*amd64-[0-9]" + sles-15-6: ".*sles.*15-6.*amd64-[0-9]" + # rhel-7-6-sap-ha: ".*redhat.*7-6.*amd64.*hana.*" # retrievable from deprecated list + # rhel-7-9-sap-ha: ".*redhat.*7-9.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-1-sap-ha: ".*redhat.*8-1.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-2-sap-ha: ".*redhat.*8-2.*amd64.*hana.*" # retrievable from deprecated list rhel-8-4-sap-ha: ".*redhat.*8-4.*amd64.*hana.*" rhel-8-6-sap-ha: ".*redhat.*8-6.*amd64.*hana.*" rhel-8-8-sap-ha: ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha: ".*redhat.*8-10.*amd64.*hana.*" rhel-9-0-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" - rhel-9-2-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha: ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha: ".*redhat.*9-4.*amd64.*hana.*" + # sles-12-4-sap-ha: ".*sles.*12-4.*amd64.*hana.*" # retrievable from deprecated list + # sles-12-5-sap-ha: ".*sles.*12-5.*amd64.*hana.*" # retrievable from deprecated list + # sles-15-1-sap-ha: ".*sles.*15-1.*amd64.*hana.*" # retrievable from deprecated list sles-15-3-sap-ha: ".*sles.*15-3.*amd64.*hana.*" sles-15-4-sap-ha: ".*sles.*15-4.*amd64.*hana.*" sles-15-5-sap-ha: ".*sles.*15-5.*amd64.*hana.*" + sles-15-6-sap-ha: ".*sles.*15-6.*amd64.*hana.*" sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: @@ -1052,17 +1116,26 @@ sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: # Full Linux subscription ppc64le OS Images with support and activation keys sap_vm_provision_ibmcloud_powervs_host_os_image_dictionary: - rhel-8-4: ".*RHEL.*8.*4" - rhel-8-6: ".*RHEL.*8.*6" + rhel-8-8: ".*RHEL.*8.*8" rhel-9-2: ".*RHEL.*9.*2" - sles-15-3: ".*SLES.*15.*3" - sles-15-4: ".*SLES.*15.*4" + rhel-9-4: ".*RHEL.*9.*4" + sles-15-5: ".*SLES.*15.*5$" + rhel-8-4-sap-ha: "RHEL8-SP4-SAP" rhel-8-6-sap-ha: ".*RHEL.*8.*6.*SAP$" # ensure string suffix using $ rhel-8-8-sap-ha: ".*RHEL.*8.*8.*SAP$" # ensure string suffix using $ rhel-9-2-sap-ha: ".*RHEL.*9.*2.*SAP$" # ensure string suffix using $ sles-15-2-sap-ha: ".*SLES.*15.*2.*SAP$" # ensure string suffix using $ sles-15-3-sap-ha: ".*SLES.*15.*3.*SAP$" # ensure string suffix using $ sles-15-4-sap-ha: ".*SLES.*15.*4.*SAP$" # ensure string suffix using $ + sles-15-5-sap-ha: "SLES15-SP5-SAP" + # rhel-8-4-sap-ha-byol: "RHEL8-SP4-SAP-BYOL" + # rhel-8-6-sap-ha-byol: ".*RHEL.*8.*6.*SAP-BYOL$" # ensure string suffix using $ + # rhel-8-8-sap-ha-byol: ".*RHEL.*8.*8.*SAP-BYOL$" # ensure string suffix using $ + # rhel-9-2-sap-ha-byol: ".*RHEL.*9.*2.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-2-sap-ha-byol: ".*SLES.*15.*2.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-3-sap-ha-byol: ".*SLES.*15.*3.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-4-sap-ha-byol: ".*SLES.*15.*4.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-5-sap-ha-byol: "SLES15-SP5-SAP-BYOL" sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: @@ -1123,7 +1196,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: # See SAP Note 1597355 - Swap-space recommendation for Linux - name: swap # sbx disk_size: 96 - disk_type: tier3 + disk_type: tier1 filesystem_type: swap # must be swap filesystem - name: software @@ -1139,96 +1212,186 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: #### sap_vm_provision_msazure_vm_host_os_image_dictionary: - + rhel-8-0: + publisher: "RedHat" + offer: "RHEL" + sku: "8-gen2" + rhel-8-1: + publisher: "RedHat" + offer: "RHEL" + sku: "81-gen2" + rhel-8-2: + publisher: "RedHat" + offer: "RHEL" + sku: "82-gen2" + rhel-8-3: + publisher: "RedHat" + offer: "RHEL" + sku: "83-gen2" rhel-8-4: publisher: "RedHat" offer: "RHEL" sku: "84-gen2" - + rhel-8-5: + publisher: "RedHat" + offer: "RHEL" + sku: "85-gen2" + rhel-8-6: + publisher: "RedHat" + offer: "RHEL" + sku: "86-gen2" + rhel-8-7: + publisher: "RedHat" + offer: "RHEL" + sku: "87-gen2" + rhel-8-8: + publisher: "RedHat" + offer: "RHEL" + sku: "88-gen2" + rhel-8-9: + publisher: "RedHat" + offer: "RHEL" + sku: "89-gen2" + rhel-8-10: + publisher: "RedHat" + offer: "RHEL" + sku: "810-gen2" + rhel-9-0: + publisher: "RedHat" + offer: "RHEL" + sku: "90-gen2" + rhel-9-1: + publisher: "RedHat" + offer: "RHEL" + sku: "91-gen2" + rhel-9-2: + publisher: "RedHat" + offer: "RHEL" + sku: "92-gen2" + rhel-9-3: + publisher: "RedHat" + offer: "RHEL" + sku: "93-gen2" + rhel-9-4: + publisher: "RedHat" + offer: "RHEL" + sku: "94-gen2" + sles-12-5: + publisher: "SUSE" + offer: "sles-12-sp5" + sku: "gen2" + sles-15-1: + publisher: "SUSE" + offer: "sles-15-sp1" + sku: "gen2" + sles-15-2: + publisher: "SUSE" + offer: "sles-15-sp2" + sku: "gen2" + sles-15-3: + publisher: "SUSE" + offer: "sles-15-sp3" + sku: "gen2" + sles-15-4: + publisher: "SUSE" + offer: "sles-15-sp4" + sku: "gen2" + sles-15-5: + publisher: "SUSE" + offer: "sles-15-sp5" + sku: "gen2" + sles-15-6: + publisher: "SUSE" + offer: "sles-15-sp6" + sku: "gen2" rhel-8-1-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "81sapha-gen2" - rhel-8-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "82sapha-gen2" - rhel-8-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "84sapha-gen2" - rhel-8-6-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "86sapha-gen2" - rhel-8-8-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "88sapha-gen2" - + rhel-8-10-sap-ha: + publisher: "RedHat" + offer: "RHEL-SAP-HA" + sku: "810sapha-gen2" rhel-9-0-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "90sapha-gen2" - rhel-9-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "92sapha-gen2" - - rhel-8-1-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "81sapapps-gen2" - - rhel-8-2-sap-applications: + rhel-9-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" - sku: "82sapapps-gen2" - - rhel-8-4-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "84sapapps-gen2" - - rhel-8-6-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "86sapapps-gen2" - - rhel-8-8-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "88sapapps-gen2" - - rhel-9-0-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "90sapapps-gen2" - - rhel-9-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "92sapapps-gen2" - - sles-15-sp3-sap: + sku: "94sapha-gen2" + sles-12-5-sap-ha: + publisher: "SUSE" + offer: "sles-sap-12-sp5" + sku: "gen2" + sles-15-1-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp1" + sku: "gen2" + sles-15-2-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp2" + sku: "gen2" + sles-15-3-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp3" sku: "gen2" - - sles-15-sp4-sap: + sles-15-4-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp4" sku: "gen2" - - sles-15-sp5-sap: + sles-15-5-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp5" sku: "gen2" + sles-15-6-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp6" + sku: "gen2" + sles-15-1-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp1-byos" + sku: "gen2" + sles-15-2-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp2-byos" + sku: "gen2" + sles-15-3-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp3-byos" + sku: "gen2" + sles-15-4-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp4-byos" + sku: "gen2" + sles-15-5-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp5-byos" + sku: "gen2" + sles-15-6-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp6-byos" + sku: "gen2" sap_vm_provision_msazure_vm_host_specifications_dictionary: diff --git a/deploy_scenarios/sap_s4hana_sandbox/ansible_playbook.yml b/deploy_scenarios/sap_s4hana_sandbox/ansible_playbook.yml index dad4307..9faaa0a 100644 --- a/deploy_scenarios/sap_s4hana_sandbox/ansible_playbook.yml +++ b/deploy_scenarios/sap_s4hana_sandbox/ansible_playbook.yml @@ -129,7 +129,6 @@ mode: '0755' loop: - "{{ sap_install_media_detect_source_directory }}" - - "{{ sap_hana_install_software_directory }}" - name: Install Python package manager pip3 to system Python ansible.builtin.package: diff --git a/deploy_scenarios/sap_s4hana_sandbox/ansible_requirements.yml b/deploy_scenarios/sap_s4hana_sandbox/ansible_requirements.yml index af7ed22..1454ec5 100644 --- a/deploy_scenarios/sap_s4hana_sandbox/ansible_requirements.yml +++ b/deploy_scenarios/sap_s4hana_sandbox/ansible_requirements.yml @@ -8,16 +8,16 @@ collections: version: 6.1.0 - name: fedora.linux_system_roles type: galaxy - version: 1.82.0 + version: 1.88.9 - name: community.sap_install type: galaxy - version: 1.4.0 + version: 1.5.0 - name: community.sap_launchpad type: galaxy - version: 1.1.0 + version: 1.1.1 - name: community.sap_infrastructure type: galaxy - version: 1.0.1 + version: 1.1.0 # - name: community.sap_operations # type: galaxy # version: 0.9.1 @@ -25,23 +25,23 @@ collections: # Collections for Infrastructure from Ansible Galaxy - name: cloud.terraform type: galaxy - version: 1.1.0 + version: 3.0.0 - name: amazon.aws type: galaxy - version: 7.2.0 + version: 9.0.0 - name: community.aws type: galaxy - version: 7.1.0 + version: 9.0.0 - name: azure.azcollection type: galaxy - version: 2.2.0 + version: 3.0.1 - name: google.cloud type: galaxy version: 1.1.3 # Replace with ibm.cloud in future, legacy Ansible Collection uses hidden on-the-fly Terraform files in /var/tmp/ansible/ibmcloud) - name: ibm.cloudcollection type: galaxy - version: 1.51.0 + version: 1.71.2 - name: ovirt.ovirt type: galaxy version: 3.1.2 @@ -53,21 +53,12 @@ collections: version: 3.0.0 - name: cloud.common type: galaxy - version: 3.0.0 + version: 4.0.0 # Collections from public repositories via HTTPS # - name: https://github.com/sap-linuxlab/community.sap_install.git # type: git # version: dev -# - name: https://github.com/sap-linuxlab/community.sap_launchpad.git -# type: git -# version: main -# - name: https://github.com/sap-linuxlab/community.sap_operations.git -# type: git -# version: main -# - name: https://github.com/ansible-collections/cloud.terraform.git -# type: git -# version: main # Collections from private repositories via use SSH (embedded GitHub PAT does not work) # Used for customised/forked Ansible Collections diff --git a/deploy_scenarios/sap_s4hana_sandbox/optional/ansible_extravars_noninteractive.yml b/deploy_scenarios/sap_s4hana_sandbox/optional/ansible_extravars_noninteractive.yml index db8e88c..34a461f 100755 --- a/deploy_scenarios/sap_s4hana_sandbox/optional/ansible_extravars_noninteractive.yml +++ b/deploy_scenarios/sap_s4hana_sandbox/optional/ansible_extravars_noninteractive.yml @@ -113,13 +113,14 @@ sap_vm_provision_ibmcloud_vpc_sg_names: "ENTER_STRING_VALUE_HERE,ENTER_STRING_VA #### sap_vm_provision_ibmcloud_api_key: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ibmcloud_resource_group_name: "ENTER_STRING_VALUE_HERE" # if ansible_to_terraform, use "new" -sap_vm_provision_ibmcloud_private_dns_instance_name: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_private_dns_instance_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform sap_vm_provision_ibmcloud_powervs_location: "ENTER_STRING_VALUE_HERE" -sap_vm_provision_ibmcloud_powervs_workspace_name: "ENTER_STRING_VALUE_HERE" -sap_vm_provision_ibmcloud_powervs_vlan_subnet_name: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_powervs_workspace_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform +sap_vm_provision_ibmcloud_powervs_vlan_subnet_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform sap_vm_provision_ibmcloud_powervs_host_os_image: "ENTER_STRING_VALUE_HERE" sap_vm_provision_bastion_user: "ENTER_STRING_VALUE_HERE" sap_vm_provision_bastion_ssh_port: "ENTER_STRING_VALUE_HERE" +# sap_vm_provision_ibmcloud_vpc_subnet_name: "ENTER_STRING_VALUE_HERE" # only for ansible_to_terraform, can be name or 'new' # Only for use when 'ansible' is value provided for variable sap_vm_provision_iac_type #### @@ -127,6 +128,7 @@ sap_vm_provision_bastion_public_ip: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ssh_bastion_private_key_file_path: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ssh_host_private_key_file_path: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ibmcloud_powervs_key_pair_name_ssh_host_public_key: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_private_dns_custom_resolver_ip: "ENTER_STRING_VALUE_HERE" # sap_vm_provision_ibmcloud_private_dns_resource_group_name: "" # optional, default use of sap_vm_provision_ibmcloud_resource_group_name sap_vm_provision_proxy_web_forward_proxy_ip: "ENTER_STRING_VALUE_HERE" # IP:Port only, no http:// prefix sap_vm_provision_proxy_web_forward_exclusions: "localhost,127.0.0.1,{{ sap_vm_provision_dns_root_domain }}" @@ -328,7 +330,7 @@ sap_id_user: "ENTER_STRING_VALUE_HERE" sap_id_user_password: 'ENTER_STRING_VALUE_HERE' # Directory for SAP installation media -sap_software_download_directory: "ENTER_STRING_VALUE_HERE" +sap_install_media_detect_source_directory: "ENTER_STRING_VALUE_HERE" # e.g. /software #### diff --git a/deploy_scenarios/sap_s4hana_sandbox_maintplan/ansible_extravars.yml b/deploy_scenarios/sap_s4hana_sandbox_maintplan/ansible_extravars.yml index 3f40d8d..84804a8 100755 --- a/deploy_scenarios/sap_s4hana_sandbox_maintplan/ansible_extravars.yml +++ b/deploy_scenarios/sap_s4hana_sandbox_maintplan/ansible_extravars.yml @@ -288,27 +288,43 @@ sap_swpm_templates_install_dictionary: sap_vm_provision_aws_ec2_vs_host_os_image_dictionary: rhel-8-1: "*RHEL-8.1*_HVM*x86_64*" - rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" + # rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" # removed rhel-8-4: "*RHEL-8.4*_HVM*x86_64*" rhel-8-6: "*RHEL-8.6*_HVM*x86_64*" rhel-8-8: "*RHEL-8.8*_HVM*x86_64*" + rhel-8-10: "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0: "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1: "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2: "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3: "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4: "*RHEL-9.4*_HVM*x86_64*" + sles-12-5: "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" # removed + # sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" # removed + # sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" # removed + sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6: "*suse-sles-15-sp6-v202*-hvm-ssd-x86_64*" + # rhel-7-7-sap-ha: "*RHEL-SAP-8.1.0*" # removed + # rhel-7-9-sap-ha: "*RHEL-SAP-8.1.0*" # removed rhel-8-1-sap-ha: "*RHEL-SAP-8.1.0*" rhel-8-2-sap-ha: "*RHEL-SAP-8.2.0*" rhel-8-4-sap-ha: "*RHEL-SAP-8.4.0*" rhel-8-6-sap-ha: "*RHEL-SAP-8.6.0*" rhel-8-8-sap-ha: "*RHEL-SAP-8.8.0*" + rhel-8-10-sap-ha: "*RHEL-SAP-8.10.0*" rhel-9-0-sap-ha: "*RHEL-SAP-9.0.0*" rhel-9-2-sap-ha: "*RHEL-SAP-9.2.0*" - sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" - sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" - sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" - sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + rhel-9-4-sap-ha: "*RHEL-SAP-9.4.0*" sles-12-5-sap-ha: "*suse-sles-sap-12-sp5-v202*-hvm-ssd-x86_64*" sles-15-1-sap-ha: "*suse-sles-sap-15-sp1-v202*-hvm-ssd-x86_64*" sles-15-2-sap-ha: "*suse-sles-sap-15-sp2-v202*-hvm-ssd-x86_64*" sles-15-3-sap-ha: "*suse-sles-sap-15-sp3-v202*-hvm-ssd-x86_64*" sles-15-4-sap-ha: "*suse-sles-sap-15-sp4-v202*-hvm-ssd-x86_64*" sles-15-5-sap-ha: "*suse-sles-sap-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha: "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" + sles-15-4-sap-ha-byos: "*suse-sles-sap-15-sp4-byos-v202*-hvm-ssd-x86_64*" + sles-15-5-sap-ha-byos: "*suse-sles-sap-15-sp5-byos-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha-byos: "*suse-sles-sap-15-sp6-byos-v202*-hvm-ssd-x86_64*" sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: @@ -398,42 +414,75 @@ sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: #### sap_vm_provision_gcp_ce_vm_host_os_image_dictionary: - rhel-8-latest: project: "rhel-cloud" family: "rhel-8" - - rhel-8-1-sap-ha: + rhel-9-latest: + project: "rhel-cloud" + family: "rhel-9" + sles-12-latest: + project: "suse-cloud" + family: "sles-12" + sles-15-latest: + project: "suse-cloud" + family: "sles-15" + # rhel-7-7-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-7-7-sap-ha" + rhel-7-9-sap-ha: project: "rhel-sap-cloud" - family: "rhel-8-1-sap-ha" - + family: "rhel-7-9-sap-ha" + # rhel-8-1-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-8-1-sap-ha" rhel-8-2-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-2-sap-ha" - rhel-8-4-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-4-sap-ha" - rhel-8-6-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-6-sap-ha" - - sles-15-latest: - project: "suse-cloud" - family: "sles-15" - - sles-15-sp3-sap: + sles-12-5-sap-ha: + project: "suse-sap-cloud" + family: "sles-12-sp5-sap" + # sles-15-1-sap-ha: # removed + # project: "suse-sap-cloud" + # family: "sles-15-sp1-sap" + sles-15-2-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp2-sap" + sles-15-3-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp3-sap" - - sles-15-sp4-sap: + sles-15-4-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp4-sap" - - sles-15-sp5-sap: + sles-15-5-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp5-sap" + sles-15-6-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp6-sap" + sles-12-5-sap-ha-byos: + project: "suse-byos-cloud" + family: "sles-12-sp5-sap-byos" + sles-15-2-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp2-sap-byos" + sles-15-3-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp3-sap-byos" + sles-15-4-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp4-sap-byos" + sles-15-5-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp5-sap-byos" + sles-15-6-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp6-sap-byos" sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: @@ -523,16 +572,31 @@ sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: sap_vm_provision_ibmcloud_vs_host_os_image_dictionary: rhel-8-4: ".*redhat.*8-4.*minimal.*amd64.*" rhel-8-6: ".*redhat.*8-6.*minimal.*amd64.*" + rhel-8-8: ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10: ".*redhat.*8-10.*minimal.*amd64.*" rhel-9-0: ".*redhat.*9-0.*minimal.*amd64.*" rhel-9-2: ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4: ".*redhat.*9-4.*minimal.*amd64.*" + sles-15-5: ".*sles.*15-5.*amd64-[0-9]" + sles-15-6: ".*sles.*15-6.*amd64-[0-9]" + # rhel-7-6-sap-ha: ".*redhat.*7-6.*amd64.*hana.*" # retrievable from deprecated list + # rhel-7-9-sap-ha: ".*redhat.*7-9.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-1-sap-ha: ".*redhat.*8-1.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-2-sap-ha: ".*redhat.*8-2.*amd64.*hana.*" # retrievable from deprecated list rhel-8-4-sap-ha: ".*redhat.*8-4.*amd64.*hana.*" rhel-8-6-sap-ha: ".*redhat.*8-6.*amd64.*hana.*" rhel-8-8-sap-ha: ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha: ".*redhat.*8-10.*amd64.*hana.*" rhel-9-0-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" - rhel-9-2-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha: ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha: ".*redhat.*9-4.*amd64.*hana.*" + # sles-12-4-sap-ha: ".*sles.*12-4.*amd64.*hana.*" # retrievable from deprecated list + # sles-12-5-sap-ha: ".*sles.*12-5.*amd64.*hana.*" # retrievable from deprecated list + # sles-15-1-sap-ha: ".*sles.*15-1.*amd64.*hana.*" # retrievable from deprecated list sles-15-3-sap-ha: ".*sles.*15-3.*amd64.*hana.*" sles-15-4-sap-ha: ".*sles.*15-4.*amd64.*hana.*" sles-15-5-sap-ha: ".*sles.*15-5.*amd64.*hana.*" + sles-15-6-sap-ha: ".*sles.*15-6.*amd64.*hana.*" sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: @@ -621,17 +685,26 @@ sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: # Full Linux subscription ppc64le OS Images with support and activation keys sap_vm_provision_ibmcloud_powervs_host_os_image_dictionary: - rhel-8-4: ".*RHEL.*8.*4" - rhel-8-6: ".*RHEL.*8.*6" + rhel-8-8: ".*RHEL.*8.*8" rhel-9-2: ".*RHEL.*9.*2" - sles-15-3: ".*SLES.*15.*3" - sles-15-4: ".*SLES.*15.*4" + rhel-9-4: ".*RHEL.*9.*4" + sles-15-5: ".*SLES.*15.*5$" + rhel-8-4-sap-ha: "RHEL8-SP4-SAP" rhel-8-6-sap-ha: ".*RHEL.*8.*6.*SAP$" # ensure string suffix using $ rhel-8-8-sap-ha: ".*RHEL.*8.*8.*SAP$" # ensure string suffix using $ rhel-9-2-sap-ha: ".*RHEL.*9.*2.*SAP$" # ensure string suffix using $ sles-15-2-sap-ha: ".*SLES.*15.*2.*SAP$" # ensure string suffix using $ sles-15-3-sap-ha: ".*SLES.*15.*3.*SAP$" # ensure string suffix using $ sles-15-4-sap-ha: ".*SLES.*15.*4.*SAP$" # ensure string suffix using $ + sles-15-5-sap-ha: "SLES15-SP5-SAP" + # rhel-8-4-sap-ha-byol: "RHEL8-SP4-SAP-BYOL" + # rhel-8-6-sap-ha-byol: ".*RHEL.*8.*6.*SAP-BYOL$" # ensure string suffix using $ + # rhel-8-8-sap-ha-byol: ".*RHEL.*8.*8.*SAP-BYOL$" # ensure string suffix using $ + # rhel-9-2-sap-ha-byol: ".*RHEL.*9.*2.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-2-sap-ha-byol: ".*SLES.*15.*2.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-3-sap-ha-byol: ".*SLES.*15.*3.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-4-sap-ha-byol: ".*SLES.*15.*4.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-5-sap-ha-byol: "SLES15-SP5-SAP-BYOL" sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: @@ -692,7 +765,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: # See SAP Note 1597355 - Swap-space recommendation for Linux - name: swap # sbx disk_size: 96 - disk_type: tier3 + disk_type: tier1 filesystem_type: swap # must be swap filesystem - name: software @@ -708,96 +781,186 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: #### sap_vm_provision_msazure_vm_host_os_image_dictionary: - + rhel-8-0: + publisher: "RedHat" + offer: "RHEL" + sku: "8-gen2" + rhel-8-1: + publisher: "RedHat" + offer: "RHEL" + sku: "81-gen2" + rhel-8-2: + publisher: "RedHat" + offer: "RHEL" + sku: "82-gen2" + rhel-8-3: + publisher: "RedHat" + offer: "RHEL" + sku: "83-gen2" rhel-8-4: publisher: "RedHat" offer: "RHEL" sku: "84-gen2" - + rhel-8-5: + publisher: "RedHat" + offer: "RHEL" + sku: "85-gen2" + rhel-8-6: + publisher: "RedHat" + offer: "RHEL" + sku: "86-gen2" + rhel-8-7: + publisher: "RedHat" + offer: "RHEL" + sku: "87-gen2" + rhel-8-8: + publisher: "RedHat" + offer: "RHEL" + sku: "88-gen2" + rhel-8-9: + publisher: "RedHat" + offer: "RHEL" + sku: "89-gen2" + rhel-8-10: + publisher: "RedHat" + offer: "RHEL" + sku: "810-gen2" + rhel-9-0: + publisher: "RedHat" + offer: "RHEL" + sku: "90-gen2" + rhel-9-1: + publisher: "RedHat" + offer: "RHEL" + sku: "91-gen2" + rhel-9-2: + publisher: "RedHat" + offer: "RHEL" + sku: "92-gen2" + rhel-9-3: + publisher: "RedHat" + offer: "RHEL" + sku: "93-gen2" + rhel-9-4: + publisher: "RedHat" + offer: "RHEL" + sku: "94-gen2" + sles-12-5: + publisher: "SUSE" + offer: "sles-12-sp5" + sku: "gen2" + sles-15-1: + publisher: "SUSE" + offer: "sles-15-sp1" + sku: "gen2" + sles-15-2: + publisher: "SUSE" + offer: "sles-15-sp2" + sku: "gen2" + sles-15-3: + publisher: "SUSE" + offer: "sles-15-sp3" + sku: "gen2" + sles-15-4: + publisher: "SUSE" + offer: "sles-15-sp4" + sku: "gen2" + sles-15-5: + publisher: "SUSE" + offer: "sles-15-sp5" + sku: "gen2" + sles-15-6: + publisher: "SUSE" + offer: "sles-15-sp6" + sku: "gen2" rhel-8-1-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "81sapha-gen2" - rhel-8-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "82sapha-gen2" - rhel-8-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "84sapha-gen2" - rhel-8-6-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "86sapha-gen2" - rhel-8-8-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "88sapha-gen2" - + rhel-8-10-sap-ha: + publisher: "RedHat" + offer: "RHEL-SAP-HA" + sku: "810sapha-gen2" rhel-9-0-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "90sapha-gen2" - rhel-9-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "92sapha-gen2" - - rhel-8-1-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "81sapapps-gen2" - - rhel-8-2-sap-applications: + rhel-9-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" - sku: "82sapapps-gen2" - - rhel-8-4-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "84sapapps-gen2" - - rhel-8-6-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "86sapapps-gen2" - - rhel-8-8-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "88sapapps-gen2" - - rhel-9-0-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "90sapapps-gen2" - - rhel-9-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "92sapapps-gen2" - - sles-15-sp3-sap: + sku: "94sapha-gen2" + sles-12-5-sap-ha: + publisher: "SUSE" + offer: "sles-sap-12-sp5" + sku: "gen2" + sles-15-1-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp1" + sku: "gen2" + sles-15-2-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp2" + sku: "gen2" + sles-15-3-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp3" sku: "gen2" - - sles-15-sp4-sap: + sles-15-4-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp4" sku: "gen2" - - sles-15-sp5-sap: + sles-15-5-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp5" sku: "gen2" + sles-15-6-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp6" + sku: "gen2" + sles-15-1-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp1-byos" + sku: "gen2" + sles-15-2-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp2-byos" + sku: "gen2" + sles-15-3-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp3-byos" + sku: "gen2" + sles-15-4-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp4-byos" + sku: "gen2" + sles-15-5-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp5-byos" + sku: "gen2" + sles-15-6-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp6-byos" + sku: "gen2" sap_vm_provision_msazure_vm_host_specifications_dictionary: diff --git a/deploy_scenarios/sap_s4hana_sandbox_maintplan/ansible_playbook.yml b/deploy_scenarios/sap_s4hana_sandbox_maintplan/ansible_playbook.yml index 122ee25..b10032e 100644 --- a/deploy_scenarios/sap_s4hana_sandbox_maintplan/ansible_playbook.yml +++ b/deploy_scenarios/sap_s4hana_sandbox_maintplan/ansible_playbook.yml @@ -129,7 +129,6 @@ mode: '0755' loop: - "{{ sap_install_media_detect_source_directory }}" - - "{{ sap_hana_install_software_directory }}" - name: Install Python package manager pip3 to system Python ansible.builtin.package: diff --git a/deploy_scenarios/sap_s4hana_sandbox_maintplan/ansible_requirements.yml b/deploy_scenarios/sap_s4hana_sandbox_maintplan/ansible_requirements.yml index af7ed22..1454ec5 100644 --- a/deploy_scenarios/sap_s4hana_sandbox_maintplan/ansible_requirements.yml +++ b/deploy_scenarios/sap_s4hana_sandbox_maintplan/ansible_requirements.yml @@ -8,16 +8,16 @@ collections: version: 6.1.0 - name: fedora.linux_system_roles type: galaxy - version: 1.82.0 + version: 1.88.9 - name: community.sap_install type: galaxy - version: 1.4.0 + version: 1.5.0 - name: community.sap_launchpad type: galaxy - version: 1.1.0 + version: 1.1.1 - name: community.sap_infrastructure type: galaxy - version: 1.0.1 + version: 1.1.0 # - name: community.sap_operations # type: galaxy # version: 0.9.1 @@ -25,23 +25,23 @@ collections: # Collections for Infrastructure from Ansible Galaxy - name: cloud.terraform type: galaxy - version: 1.1.0 + version: 3.0.0 - name: amazon.aws type: galaxy - version: 7.2.0 + version: 9.0.0 - name: community.aws type: galaxy - version: 7.1.0 + version: 9.0.0 - name: azure.azcollection type: galaxy - version: 2.2.0 + version: 3.0.1 - name: google.cloud type: galaxy version: 1.1.3 # Replace with ibm.cloud in future, legacy Ansible Collection uses hidden on-the-fly Terraform files in /var/tmp/ansible/ibmcloud) - name: ibm.cloudcollection type: galaxy - version: 1.51.0 + version: 1.71.2 - name: ovirt.ovirt type: galaxy version: 3.1.2 @@ -53,21 +53,12 @@ collections: version: 3.0.0 - name: cloud.common type: galaxy - version: 3.0.0 + version: 4.0.0 # Collections from public repositories via HTTPS # - name: https://github.com/sap-linuxlab/community.sap_install.git # type: git # version: dev -# - name: https://github.com/sap-linuxlab/community.sap_launchpad.git -# type: git -# version: main -# - name: https://github.com/sap-linuxlab/community.sap_operations.git -# type: git -# version: main -# - name: https://github.com/ansible-collections/cloud.terraform.git -# type: git -# version: main # Collections from private repositories via use SSH (embedded GitHub PAT does not work) # Used for customised/forked Ansible Collections diff --git a/deploy_scenarios/sap_s4hana_sandbox_maintplan/optional/ansible_extravars_noninteractive.yml b/deploy_scenarios/sap_s4hana_sandbox_maintplan/optional/ansible_extravars_noninteractive.yml index dd634dd..1f07bb8 100755 --- a/deploy_scenarios/sap_s4hana_sandbox_maintplan/optional/ansible_extravars_noninteractive.yml +++ b/deploy_scenarios/sap_s4hana_sandbox_maintplan/optional/ansible_extravars_noninteractive.yml @@ -113,13 +113,14 @@ sap_vm_provision_ibmcloud_vpc_sg_names: "ENTER_STRING_VALUE_HERE,ENTER_STRING_VA #### sap_vm_provision_ibmcloud_api_key: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ibmcloud_resource_group_name: "ENTER_STRING_VALUE_HERE" # if ansible_to_terraform, use "new" -sap_vm_provision_ibmcloud_private_dns_instance_name: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_private_dns_instance_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform sap_vm_provision_ibmcloud_powervs_location: "ENTER_STRING_VALUE_HERE" -sap_vm_provision_ibmcloud_powervs_workspace_name: "ENTER_STRING_VALUE_HERE" -sap_vm_provision_ibmcloud_powervs_vlan_subnet_name: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_powervs_workspace_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform +sap_vm_provision_ibmcloud_powervs_vlan_subnet_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform sap_vm_provision_ibmcloud_powervs_host_os_image: "ENTER_STRING_VALUE_HERE" sap_vm_provision_bastion_user: "ENTER_STRING_VALUE_HERE" sap_vm_provision_bastion_ssh_port: "ENTER_STRING_VALUE_HERE" +# sap_vm_provision_ibmcloud_vpc_subnet_name: "ENTER_STRING_VALUE_HERE" # only for ansible_to_terraform, can be name or 'new' # Only for use when 'ansible' is value provided for variable sap_vm_provision_iac_type #### @@ -127,6 +128,7 @@ sap_vm_provision_bastion_public_ip: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ssh_bastion_private_key_file_path: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ssh_host_private_key_file_path: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ibmcloud_powervs_key_pair_name_ssh_host_public_key: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_private_dns_custom_resolver_ip: "ENTER_STRING_VALUE_HERE" # sap_vm_provision_ibmcloud_private_dns_resource_group_name: "" # optional, default use of sap_vm_provision_ibmcloud_resource_group_name sap_vm_provision_proxy_web_forward_proxy_ip: "ENTER_STRING_VALUE_HERE" # IP:Port only, no http:// prefix sap_vm_provision_proxy_web_forward_exclusions: "localhost,127.0.0.1,{{ sap_vm_provision_dns_root_domain }}" @@ -331,7 +333,7 @@ sap_id_user_password: 'ENTER_STRING_VALUE_HERE' sap_maintenance_planner_transaction_name: 'ENTER_STRING_VALUE_HERE' # Directory for SAP installation media -sap_software_download_directory: "ENTER_STRING_VALUE_HERE" +sap_install_media_detect_source_directory: "ENTER_STRING_VALUE_HERE" # e.g. /software #### diff --git a/deploy_scenarios/sap_s4hana_standard/ansible_extravars.yml b/deploy_scenarios/sap_s4hana_standard/ansible_extravars.yml index ae57136..3ce1cdb 100755 --- a/deploy_scenarios/sap_s4hana_standard/ansible_extravars.yml +++ b/deploy_scenarios/sap_s4hana_standard/ansible_extravars.yml @@ -791,27 +791,43 @@ sap_swpm_templates_install_dictionary: sap_vm_provision_aws_ec2_vs_host_os_image_dictionary: rhel-8-1: "*RHEL-8.1*_HVM*x86_64*" - rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" + # rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" # removed rhel-8-4: "*RHEL-8.4*_HVM*x86_64*" rhel-8-6: "*RHEL-8.6*_HVM*x86_64*" rhel-8-8: "*RHEL-8.8*_HVM*x86_64*" + rhel-8-10: "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0: "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1: "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2: "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3: "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4: "*RHEL-9.4*_HVM*x86_64*" + sles-12-5: "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" # removed + # sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" # removed + # sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" # removed + sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6: "*suse-sles-15-sp6-v202*-hvm-ssd-x86_64*" + # rhel-7-7-sap-ha: "*RHEL-SAP-8.1.0*" # removed + # rhel-7-9-sap-ha: "*RHEL-SAP-8.1.0*" # removed rhel-8-1-sap-ha: "*RHEL-SAP-8.1.0*" rhel-8-2-sap-ha: "*RHEL-SAP-8.2.0*" rhel-8-4-sap-ha: "*RHEL-SAP-8.4.0*" rhel-8-6-sap-ha: "*RHEL-SAP-8.6.0*" rhel-8-8-sap-ha: "*RHEL-SAP-8.8.0*" + rhel-8-10-sap-ha: "*RHEL-SAP-8.10.0*" rhel-9-0-sap-ha: "*RHEL-SAP-9.0.0*" rhel-9-2-sap-ha: "*RHEL-SAP-9.2.0*" - sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" - sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" - sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" - sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + rhel-9-4-sap-ha: "*RHEL-SAP-9.4.0*" sles-12-5-sap-ha: "*suse-sles-sap-12-sp5-v202*-hvm-ssd-x86_64*" sles-15-1-sap-ha: "*suse-sles-sap-15-sp1-v202*-hvm-ssd-x86_64*" sles-15-2-sap-ha: "*suse-sles-sap-15-sp2-v202*-hvm-ssd-x86_64*" sles-15-3-sap-ha: "*suse-sles-sap-15-sp3-v202*-hvm-ssd-x86_64*" sles-15-4-sap-ha: "*suse-sles-sap-15-sp4-v202*-hvm-ssd-x86_64*" sles-15-5-sap-ha: "*suse-sles-sap-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha: "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" + sles-15-4-sap-ha-byos: "*suse-sles-sap-15-sp4-byos-v202*-hvm-ssd-x86_64*" + sles-15-5-sap-ha-byos: "*suse-sles-sap-15-sp5-byos-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha-byos: "*suse-sles-sap-15-sp6-byos-v202*-hvm-ssd-x86_64*" sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: @@ -916,42 +932,75 @@ sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: #### sap_vm_provision_gcp_ce_vm_host_os_image_dictionary: - rhel-8-latest: project: "rhel-cloud" family: "rhel-8" - - rhel-8-1-sap-ha: + rhel-9-latest: + project: "rhel-cloud" + family: "rhel-9" + sles-12-latest: + project: "suse-cloud" + family: "sles-12" + sles-15-latest: + project: "suse-cloud" + family: "sles-15" + # rhel-7-7-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-7-7-sap-ha" + rhel-7-9-sap-ha: project: "rhel-sap-cloud" - family: "rhel-8-1-sap-ha" - + family: "rhel-7-9-sap-ha" + # rhel-8-1-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-8-1-sap-ha" rhel-8-2-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-2-sap-ha" - rhel-8-4-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-4-sap-ha" - rhel-8-6-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-6-sap-ha" - - sles-15-latest: - project: "suse-cloud" - family: "sles-15" - - sles-15-sp3-sap: + sles-12-5-sap-ha: + project: "suse-sap-cloud" + family: "sles-12-sp5-sap" + # sles-15-1-sap-ha: # removed + # project: "suse-sap-cloud" + # family: "sles-15-sp1-sap" + sles-15-2-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp2-sap" + sles-15-3-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp3-sap" - - sles-15-sp4-sap: + sles-15-4-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp4-sap" - - sles-15-sp5-sap: + sles-15-5-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp5-sap" + sles-15-6-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp6-sap" + sles-12-5-sap-ha-byos: + project: "suse-byos-cloud" + family: "sles-12-sp5-sap-byos" + sles-15-2-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp2-sap-byos" + sles-15-3-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp3-sap-byos" + sles-15-4-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp4-sap-byos" + sles-15-5-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp5-sap-byos" + sles-15-6-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp6-sap-byos" sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: @@ -1065,16 +1114,31 @@ sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: sap_vm_provision_ibmcloud_vs_host_os_image_dictionary: rhel-8-4: ".*redhat.*8-4.*minimal.*amd64.*" rhel-8-6: ".*redhat.*8-6.*minimal.*amd64.*" + rhel-8-8: ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10: ".*redhat.*8-10.*minimal.*amd64.*" rhel-9-0: ".*redhat.*9-0.*minimal.*amd64.*" rhel-9-2: ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4: ".*redhat.*9-4.*minimal.*amd64.*" + sles-15-5: ".*sles.*15-5.*amd64-[0-9]" + sles-15-6: ".*sles.*15-6.*amd64-[0-9]" + # rhel-7-6-sap-ha: ".*redhat.*7-6.*amd64.*hana.*" # retrievable from deprecated list + # rhel-7-9-sap-ha: ".*redhat.*7-9.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-1-sap-ha: ".*redhat.*8-1.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-2-sap-ha: ".*redhat.*8-2.*amd64.*hana.*" # retrievable from deprecated list rhel-8-4-sap-ha: ".*redhat.*8-4.*amd64.*hana.*" rhel-8-6-sap-ha: ".*redhat.*8-6.*amd64.*hana.*" rhel-8-8-sap-ha: ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha: ".*redhat.*8-10.*amd64.*hana.*" rhel-9-0-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" - rhel-9-2-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha: ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha: ".*redhat.*9-4.*amd64.*hana.*" + # sles-12-4-sap-ha: ".*sles.*12-4.*amd64.*hana.*" # retrievable from deprecated list + # sles-12-5-sap-ha: ".*sles.*12-5.*amd64.*hana.*" # retrievable from deprecated list + # sles-15-1-sap-ha: ".*sles.*15-1.*amd64.*hana.*" # retrievable from deprecated list sles-15-3-sap-ha: ".*sles.*15-3.*amd64.*hana.*" sles-15-4-sap-ha: ".*sles.*15-4.*amd64.*hana.*" sles-15-5-sap-ha: ".*sles.*15-5.*amd64.*hana.*" + sles-15-6-sap-ha: ".*sles.*15-6.*amd64.*hana.*" sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: @@ -1188,17 +1252,26 @@ sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: # Full Linux subscription ppc64le OS Images with support and activation keys sap_vm_provision_ibmcloud_powervs_host_os_image_dictionary: - rhel-8-4: ".*RHEL.*8.*4" - rhel-8-6: ".*RHEL.*8.*6" + rhel-8-8: ".*RHEL.*8.*8" rhel-9-2: ".*RHEL.*9.*2" - sles-15-3: ".*SLES.*15.*3" - sles-15-4: ".*SLES.*15.*4" + rhel-9-4: ".*RHEL.*9.*4" + sles-15-5: ".*SLES.*15.*5$" + rhel-8-4-sap-ha: "RHEL8-SP4-SAP" rhel-8-6-sap-ha: ".*RHEL.*8.*6.*SAP$" # ensure string suffix using $ rhel-8-8-sap-ha: ".*RHEL.*8.*8.*SAP$" # ensure string suffix using $ rhel-9-2-sap-ha: ".*RHEL.*9.*2.*SAP$" # ensure string suffix using $ sles-15-2-sap-ha: ".*SLES.*15.*2.*SAP$" # ensure string suffix using $ sles-15-3-sap-ha: ".*SLES.*15.*3.*SAP$" # ensure string suffix using $ sles-15-4-sap-ha: ".*SLES.*15.*4.*SAP$" # ensure string suffix using $ + sles-15-5-sap-ha: "SLES15-SP5-SAP" + # rhel-8-4-sap-ha-byol: "RHEL8-SP4-SAP-BYOL" + # rhel-8-6-sap-ha-byol: ".*RHEL.*8.*6.*SAP-BYOL$" # ensure string suffix using $ + # rhel-8-8-sap-ha-byol: ".*RHEL.*8.*8.*SAP-BYOL$" # ensure string suffix using $ + # rhel-9-2-sap-ha-byol: ".*RHEL.*9.*2.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-2-sap-ha-byol: ".*SLES.*15.*2.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-3-sap-ha-byol: ".*SLES.*15.*3.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-4-sap-ha-byol: ".*SLES.*15.*4.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-5-sap-ha-byol: "SLES15-SP5-SAP-BYOL" sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: @@ -1256,7 +1329,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: - name: swap # hdb swap_path: /swapfile # use swap file on root disk, instead of creating LVM LV for swap disk_size: 2 - disk_type: tier3 + disk_type: tier1 filesystem_type: swap # must be swap filesystem - name: software @@ -1268,6 +1341,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: nwas01: # Hostname, must be 13 characters or less sap_host_type: nwas_pas # hana_primary, hana_secondary, nwas_ascs, nwas_ers, nwas_pas, nwas_aas virtual_machine_profile: "cnp-2x32" # 16 vCPU x 32GB DRAM, alt: use custom SAP instance profile sizes using cnp-2x16 (2 Power Cores [16 vCPU] x 16GB) and above + ibmcloud_powervs_hardware_machine_type: e980 # IBM Power hardware machine type (MT) used to host the Virtual Machine disable_ip_anti_spoofing: true sap_storage_setup_sid: "{{ sap_system_sid }}" @@ -1311,96 +1385,186 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: #### sap_vm_provision_msazure_vm_host_os_image_dictionary: - + rhel-8-0: + publisher: "RedHat" + offer: "RHEL" + sku: "8-gen2" + rhel-8-1: + publisher: "RedHat" + offer: "RHEL" + sku: "81-gen2" + rhel-8-2: + publisher: "RedHat" + offer: "RHEL" + sku: "82-gen2" + rhel-8-3: + publisher: "RedHat" + offer: "RHEL" + sku: "83-gen2" rhel-8-4: publisher: "RedHat" offer: "RHEL" sku: "84-gen2" - + rhel-8-5: + publisher: "RedHat" + offer: "RHEL" + sku: "85-gen2" + rhel-8-6: + publisher: "RedHat" + offer: "RHEL" + sku: "86-gen2" + rhel-8-7: + publisher: "RedHat" + offer: "RHEL" + sku: "87-gen2" + rhel-8-8: + publisher: "RedHat" + offer: "RHEL" + sku: "88-gen2" + rhel-8-9: + publisher: "RedHat" + offer: "RHEL" + sku: "89-gen2" + rhel-8-10: + publisher: "RedHat" + offer: "RHEL" + sku: "810-gen2" + rhel-9-0: + publisher: "RedHat" + offer: "RHEL" + sku: "90-gen2" + rhel-9-1: + publisher: "RedHat" + offer: "RHEL" + sku: "91-gen2" + rhel-9-2: + publisher: "RedHat" + offer: "RHEL" + sku: "92-gen2" + rhel-9-3: + publisher: "RedHat" + offer: "RHEL" + sku: "93-gen2" + rhel-9-4: + publisher: "RedHat" + offer: "RHEL" + sku: "94-gen2" + sles-12-5: + publisher: "SUSE" + offer: "sles-12-sp5" + sku: "gen2" + sles-15-1: + publisher: "SUSE" + offer: "sles-15-sp1" + sku: "gen2" + sles-15-2: + publisher: "SUSE" + offer: "sles-15-sp2" + sku: "gen2" + sles-15-3: + publisher: "SUSE" + offer: "sles-15-sp3" + sku: "gen2" + sles-15-4: + publisher: "SUSE" + offer: "sles-15-sp4" + sku: "gen2" + sles-15-5: + publisher: "SUSE" + offer: "sles-15-sp5" + sku: "gen2" + sles-15-6: + publisher: "SUSE" + offer: "sles-15-sp6" + sku: "gen2" rhel-8-1-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "81sapha-gen2" - rhel-8-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "82sapha-gen2" - rhel-8-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "84sapha-gen2" - rhel-8-6-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "86sapha-gen2" - rhel-8-8-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "88sapha-gen2" - + rhel-8-10-sap-ha: + publisher: "RedHat" + offer: "RHEL-SAP-HA" + sku: "810sapha-gen2" rhel-9-0-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "90sapha-gen2" - rhel-9-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "92sapha-gen2" - - rhel-8-1-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "81sapapps-gen2" - - rhel-8-2-sap-applications: + rhel-9-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" - sku: "82sapapps-gen2" - - rhel-8-4-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "84sapapps-gen2" - - rhel-8-6-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "86sapapps-gen2" - - rhel-8-8-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "88sapapps-gen2" - - rhel-9-0-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "90sapapps-gen2" - - rhel-9-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "92sapapps-gen2" - - sles-15-sp3-sap: + sku: "94sapha-gen2" + sles-12-5-sap-ha: + publisher: "SUSE" + offer: "sles-sap-12-sp5" + sku: "gen2" + sles-15-1-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp1" + sku: "gen2" + sles-15-2-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp2" + sku: "gen2" + sles-15-3-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp3" sku: "gen2" - - sles-15-sp4-sap: + sles-15-4-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp4" sku: "gen2" - - sles-15-sp5-sap: + sles-15-5-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp5" sku: "gen2" + sles-15-6-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp6" + sku: "gen2" + sles-15-1-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp1-byos" + sku: "gen2" + sles-15-2-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp2-byos" + sku: "gen2" + sles-15-3-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp3-byos" + sku: "gen2" + sles-15-4-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp4-byos" + sku: "gen2" + sles-15-5-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp5-byos" + sku: "gen2" + sles-15-6-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp6-byos" + sku: "gen2" sap_vm_provision_msazure_vm_host_specifications_dictionary: diff --git a/deploy_scenarios/sap_s4hana_standard/ansible_playbook.yml b/deploy_scenarios/sap_s4hana_standard/ansible_playbook.yml index f6aada9..8215117 100644 --- a/deploy_scenarios/sap_s4hana_standard/ansible_playbook.yml +++ b/deploy_scenarios/sap_s4hana_standard/ansible_playbook.yml @@ -144,7 +144,6 @@ mode: '0755' loop: - "{{ sap_install_media_detect_source_directory }}" - - "{{ sap_hana_install_software_directory }}" - name: Install Python package manager pip3 to system Python ansible.builtin.package: diff --git a/deploy_scenarios/sap_s4hana_standard/ansible_requirements.yml b/deploy_scenarios/sap_s4hana_standard/ansible_requirements.yml index af7ed22..1454ec5 100644 --- a/deploy_scenarios/sap_s4hana_standard/ansible_requirements.yml +++ b/deploy_scenarios/sap_s4hana_standard/ansible_requirements.yml @@ -8,16 +8,16 @@ collections: version: 6.1.0 - name: fedora.linux_system_roles type: galaxy - version: 1.82.0 + version: 1.88.9 - name: community.sap_install type: galaxy - version: 1.4.0 + version: 1.5.0 - name: community.sap_launchpad type: galaxy - version: 1.1.0 + version: 1.1.1 - name: community.sap_infrastructure type: galaxy - version: 1.0.1 + version: 1.1.0 # - name: community.sap_operations # type: galaxy # version: 0.9.1 @@ -25,23 +25,23 @@ collections: # Collections for Infrastructure from Ansible Galaxy - name: cloud.terraform type: galaxy - version: 1.1.0 + version: 3.0.0 - name: amazon.aws type: galaxy - version: 7.2.0 + version: 9.0.0 - name: community.aws type: galaxy - version: 7.1.0 + version: 9.0.0 - name: azure.azcollection type: galaxy - version: 2.2.0 + version: 3.0.1 - name: google.cloud type: galaxy version: 1.1.3 # Replace with ibm.cloud in future, legacy Ansible Collection uses hidden on-the-fly Terraform files in /var/tmp/ansible/ibmcloud) - name: ibm.cloudcollection type: galaxy - version: 1.51.0 + version: 1.71.2 - name: ovirt.ovirt type: galaxy version: 3.1.2 @@ -53,21 +53,12 @@ collections: version: 3.0.0 - name: cloud.common type: galaxy - version: 3.0.0 + version: 4.0.0 # Collections from public repositories via HTTPS # - name: https://github.com/sap-linuxlab/community.sap_install.git # type: git # version: dev -# - name: https://github.com/sap-linuxlab/community.sap_launchpad.git -# type: git -# version: main -# - name: https://github.com/sap-linuxlab/community.sap_operations.git -# type: git -# version: main -# - name: https://github.com/ansible-collections/cloud.terraform.git -# type: git -# version: main # Collections from private repositories via use SSH (embedded GitHub PAT does not work) # Used for customised/forked Ansible Collections diff --git a/deploy_scenarios/sap_s4hana_standard/optional/ansible_extravars_noninteractive.yml b/deploy_scenarios/sap_s4hana_standard/optional/ansible_extravars_noninteractive.yml index 91f530f..5f1dd1f 100755 --- a/deploy_scenarios/sap_s4hana_standard/optional/ansible_extravars_noninteractive.yml +++ b/deploy_scenarios/sap_s4hana_standard/optional/ansible_extravars_noninteractive.yml @@ -113,13 +113,14 @@ sap_vm_provision_ibmcloud_vpc_sg_names: "ENTER_STRING_VALUE_HERE,ENTER_STRING_VA #### sap_vm_provision_ibmcloud_api_key: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ibmcloud_resource_group_name: "ENTER_STRING_VALUE_HERE" # if ansible_to_terraform, use "new" -sap_vm_provision_ibmcloud_private_dns_instance_name: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_private_dns_instance_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform sap_vm_provision_ibmcloud_powervs_location: "ENTER_STRING_VALUE_HERE" -sap_vm_provision_ibmcloud_powervs_workspace_name: "ENTER_STRING_VALUE_HERE" -sap_vm_provision_ibmcloud_powervs_vlan_subnet_name: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_powervs_workspace_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform +sap_vm_provision_ibmcloud_powervs_vlan_subnet_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform sap_vm_provision_ibmcloud_powervs_host_os_image: "ENTER_STRING_VALUE_HERE" sap_vm_provision_bastion_user: "ENTER_STRING_VALUE_HERE" sap_vm_provision_bastion_ssh_port: "ENTER_STRING_VALUE_HERE" +# sap_vm_provision_ibmcloud_vpc_subnet_name: "ENTER_STRING_VALUE_HERE" # only for ansible_to_terraform, can be name or 'new' # Only for use when 'ansible' is value provided for variable sap_vm_provision_iac_type #### @@ -127,6 +128,7 @@ sap_vm_provision_bastion_public_ip: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ssh_bastion_private_key_file_path: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ssh_host_private_key_file_path: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ibmcloud_powervs_key_pair_name_ssh_host_public_key: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_private_dns_custom_resolver_ip: "ENTER_STRING_VALUE_HERE" # sap_vm_provision_ibmcloud_private_dns_resource_group_name: "" # optional, default use of sap_vm_provision_ibmcloud_resource_group_name sap_vm_provision_proxy_web_forward_proxy_ip: "ENTER_STRING_VALUE_HERE" # IP:Port only, no http:// prefix sap_vm_provision_proxy_web_forward_exclusions: "localhost,127.0.0.1,{{ sap_vm_provision_dns_root_domain }}" @@ -356,7 +358,7 @@ sap_id_user: "ENTER_STRING_VALUE_HERE" sap_id_user_password: 'ENTER_STRING_VALUE_HERE' # Directory for SAP installation media -sap_software_download_directory: "ENTER_STRING_VALUE_HERE" +sap_install_media_detect_source_directory: "ENTER_STRING_VALUE_HERE" # e.g. /software #### diff --git a/deploy_scenarios/sap_s4hana_standard_maintplan/ansible_extravars.yml b/deploy_scenarios/sap_s4hana_standard_maintplan/ansible_extravars.yml index 68aee91..f1a3654 100755 --- a/deploy_scenarios/sap_s4hana_standard_maintplan/ansible_extravars.yml +++ b/deploy_scenarios/sap_s4hana_standard_maintplan/ansible_extravars.yml @@ -301,27 +301,43 @@ sap_swpm_templates_install_dictionary: sap_vm_provision_aws_ec2_vs_host_os_image_dictionary: rhel-8-1: "*RHEL-8.1*_HVM*x86_64*" - rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" + # rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" # removed rhel-8-4: "*RHEL-8.4*_HVM*x86_64*" rhel-8-6: "*RHEL-8.6*_HVM*x86_64*" rhel-8-8: "*RHEL-8.8*_HVM*x86_64*" + rhel-8-10: "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0: "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1: "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2: "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3: "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4: "*RHEL-9.4*_HVM*x86_64*" + sles-12-5: "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" # removed + # sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" # removed + # sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" # removed + sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6: "*suse-sles-15-sp6-v202*-hvm-ssd-x86_64*" + # rhel-7-7-sap-ha: "*RHEL-SAP-8.1.0*" # removed + # rhel-7-9-sap-ha: "*RHEL-SAP-8.1.0*" # removed rhel-8-1-sap-ha: "*RHEL-SAP-8.1.0*" rhel-8-2-sap-ha: "*RHEL-SAP-8.2.0*" rhel-8-4-sap-ha: "*RHEL-SAP-8.4.0*" rhel-8-6-sap-ha: "*RHEL-SAP-8.6.0*" rhel-8-8-sap-ha: "*RHEL-SAP-8.8.0*" + rhel-8-10-sap-ha: "*RHEL-SAP-8.10.0*" rhel-9-0-sap-ha: "*RHEL-SAP-9.0.0*" rhel-9-2-sap-ha: "*RHEL-SAP-9.2.0*" - sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" - sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" - sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" - sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + rhel-9-4-sap-ha: "*RHEL-SAP-9.4.0*" sles-12-5-sap-ha: "*suse-sles-sap-12-sp5-v202*-hvm-ssd-x86_64*" sles-15-1-sap-ha: "*suse-sles-sap-15-sp1-v202*-hvm-ssd-x86_64*" sles-15-2-sap-ha: "*suse-sles-sap-15-sp2-v202*-hvm-ssd-x86_64*" sles-15-3-sap-ha: "*suse-sles-sap-15-sp3-v202*-hvm-ssd-x86_64*" sles-15-4-sap-ha: "*suse-sles-sap-15-sp4-v202*-hvm-ssd-x86_64*" sles-15-5-sap-ha: "*suse-sles-sap-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha: "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" + sles-15-4-sap-ha-byos: "*suse-sles-sap-15-sp4-byos-v202*-hvm-ssd-x86_64*" + sles-15-5-sap-ha-byos: "*suse-sles-sap-15-sp5-byos-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha-byos: "*suse-sles-sap-15-sp6-byos-v202*-hvm-ssd-x86_64*" sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: @@ -426,42 +442,75 @@ sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: #### sap_vm_provision_gcp_ce_vm_host_os_image_dictionary: - rhel-8-latest: project: "rhel-cloud" family: "rhel-8" - - rhel-8-1-sap-ha: + rhel-9-latest: + project: "rhel-cloud" + family: "rhel-9" + sles-12-latest: + project: "suse-cloud" + family: "sles-12" + sles-15-latest: + project: "suse-cloud" + family: "sles-15" + # rhel-7-7-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-7-7-sap-ha" + rhel-7-9-sap-ha: project: "rhel-sap-cloud" - family: "rhel-8-1-sap-ha" - + family: "rhel-7-9-sap-ha" + # rhel-8-1-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-8-1-sap-ha" rhel-8-2-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-2-sap-ha" - rhel-8-4-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-4-sap-ha" - rhel-8-6-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-6-sap-ha" - - sles-15-latest: - project: "suse-cloud" - family: "sles-15" - - sles-15-sp3-sap: + sles-12-5-sap-ha: + project: "suse-sap-cloud" + family: "sles-12-sp5-sap" + # sles-15-1-sap-ha: # removed + # project: "suse-sap-cloud" + # family: "sles-15-sp1-sap" + sles-15-2-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp2-sap" + sles-15-3-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp3-sap" - - sles-15-sp4-sap: + sles-15-4-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp4-sap" - - sles-15-sp5-sap: + sles-15-5-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp5-sap" + sles-15-6-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp6-sap" + sles-12-5-sap-ha-byos: + project: "suse-byos-cloud" + family: "sles-12-sp5-sap-byos" + sles-15-2-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp2-sap-byos" + sles-15-3-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp3-sap-byos" + sles-15-4-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp4-sap-byos" + sles-15-5-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp5-sap-byos" + sles-15-6-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp6-sap-byos" sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: @@ -575,16 +624,31 @@ sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: sap_vm_provision_ibmcloud_vs_host_os_image_dictionary: rhel-8-4: ".*redhat.*8-4.*minimal.*amd64.*" rhel-8-6: ".*redhat.*8-6.*minimal.*amd64.*" + rhel-8-8: ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10: ".*redhat.*8-10.*minimal.*amd64.*" rhel-9-0: ".*redhat.*9-0.*minimal.*amd64.*" rhel-9-2: ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4: ".*redhat.*9-4.*minimal.*amd64.*" + sles-15-5: ".*sles.*15-5.*amd64-[0-9]" + sles-15-6: ".*sles.*15-6.*amd64-[0-9]" + # rhel-7-6-sap-ha: ".*redhat.*7-6.*amd64.*hana.*" # retrievable from deprecated list + # rhel-7-9-sap-ha: ".*redhat.*7-9.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-1-sap-ha: ".*redhat.*8-1.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-2-sap-ha: ".*redhat.*8-2.*amd64.*hana.*" # retrievable from deprecated list rhel-8-4-sap-ha: ".*redhat.*8-4.*amd64.*hana.*" rhel-8-6-sap-ha: ".*redhat.*8-6.*amd64.*hana.*" rhel-8-8-sap-ha: ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha: ".*redhat.*8-10.*amd64.*hana.*" rhel-9-0-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" - rhel-9-2-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha: ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha: ".*redhat.*9-4.*amd64.*hana.*" + # sles-12-4-sap-ha: ".*sles.*12-4.*amd64.*hana.*" # retrievable from deprecated list + # sles-12-5-sap-ha: ".*sles.*12-5.*amd64.*hana.*" # retrievable from deprecated list + # sles-15-1-sap-ha: ".*sles.*15-1.*amd64.*hana.*" # retrievable from deprecated list sles-15-3-sap-ha: ".*sles.*15-3.*amd64.*hana.*" sles-15-4-sap-ha: ".*sles.*15-4.*amd64.*hana.*" sles-15-5-sap-ha: ".*sles.*15-5.*amd64.*hana.*" + sles-15-6-sap-ha: ".*sles.*15-6.*amd64.*hana.*" sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: @@ -697,17 +761,26 @@ sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: # Full Linux subscription ppc64le OS Images with support and activation keys sap_vm_provision_ibmcloud_powervs_host_os_image_dictionary: - rhel-8-4: ".*RHEL.*8.*4" - rhel-8-6: ".*RHEL.*8.*6" + rhel-8-8: ".*RHEL.*8.*8" rhel-9-2: ".*RHEL.*9.*2" - sles-15-3: ".*SLES.*15.*3" - sles-15-4: ".*SLES.*15.*4" + rhel-9-4: ".*RHEL.*9.*4" + sles-15-5: ".*SLES.*15.*5$" + rhel-8-4-sap-ha: "RHEL8-SP4-SAP" rhel-8-6-sap-ha: ".*RHEL.*8.*6.*SAP$" # ensure string suffix using $ rhel-8-8-sap-ha: ".*RHEL.*8.*8.*SAP$" # ensure string suffix using $ rhel-9-2-sap-ha: ".*RHEL.*9.*2.*SAP$" # ensure string suffix using $ sles-15-2-sap-ha: ".*SLES.*15.*2.*SAP$" # ensure string suffix using $ sles-15-3-sap-ha: ".*SLES.*15.*3.*SAP$" # ensure string suffix using $ sles-15-4-sap-ha: ".*SLES.*15.*4.*SAP$" # ensure string suffix using $ + sles-15-5-sap-ha: "SLES15-SP5-SAP" + # rhel-8-4-sap-ha-byol: "RHEL8-SP4-SAP-BYOL" + # rhel-8-6-sap-ha-byol: ".*RHEL.*8.*6.*SAP-BYOL$" # ensure string suffix using $ + # rhel-8-8-sap-ha-byol: ".*RHEL.*8.*8.*SAP-BYOL$" # ensure string suffix using $ + # rhel-9-2-sap-ha-byol: ".*RHEL.*9.*2.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-2-sap-ha-byol: ".*SLES.*15.*2.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-3-sap-ha-byol: ".*SLES.*15.*3.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-4-sap-ha-byol: ".*SLES.*15.*4.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-5-sap-ha-byol: "SLES15-SP5-SAP-BYOL" sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: @@ -765,7 +838,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: - name: swap # hdb swap_path: /swapfile # use swap file on root disk, instead of creating LVM LV for swap disk_size: 2 - disk_type: tier3 + disk_type: tier1 filesystem_type: swap # must be swap filesystem - name: software @@ -821,96 +894,186 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: #### sap_vm_provision_msazure_vm_host_os_image_dictionary: - + rhel-8-0: + publisher: "RedHat" + offer: "RHEL" + sku: "8-gen2" + rhel-8-1: + publisher: "RedHat" + offer: "RHEL" + sku: "81-gen2" + rhel-8-2: + publisher: "RedHat" + offer: "RHEL" + sku: "82-gen2" + rhel-8-3: + publisher: "RedHat" + offer: "RHEL" + sku: "83-gen2" rhel-8-4: publisher: "RedHat" offer: "RHEL" sku: "84-gen2" - + rhel-8-5: + publisher: "RedHat" + offer: "RHEL" + sku: "85-gen2" + rhel-8-6: + publisher: "RedHat" + offer: "RHEL" + sku: "86-gen2" + rhel-8-7: + publisher: "RedHat" + offer: "RHEL" + sku: "87-gen2" + rhel-8-8: + publisher: "RedHat" + offer: "RHEL" + sku: "88-gen2" + rhel-8-9: + publisher: "RedHat" + offer: "RHEL" + sku: "89-gen2" + rhel-8-10: + publisher: "RedHat" + offer: "RHEL" + sku: "810-gen2" + rhel-9-0: + publisher: "RedHat" + offer: "RHEL" + sku: "90-gen2" + rhel-9-1: + publisher: "RedHat" + offer: "RHEL" + sku: "91-gen2" + rhel-9-2: + publisher: "RedHat" + offer: "RHEL" + sku: "92-gen2" + rhel-9-3: + publisher: "RedHat" + offer: "RHEL" + sku: "93-gen2" + rhel-9-4: + publisher: "RedHat" + offer: "RHEL" + sku: "94-gen2" + sles-12-5: + publisher: "SUSE" + offer: "sles-12-sp5" + sku: "gen2" + sles-15-1: + publisher: "SUSE" + offer: "sles-15-sp1" + sku: "gen2" + sles-15-2: + publisher: "SUSE" + offer: "sles-15-sp2" + sku: "gen2" + sles-15-3: + publisher: "SUSE" + offer: "sles-15-sp3" + sku: "gen2" + sles-15-4: + publisher: "SUSE" + offer: "sles-15-sp4" + sku: "gen2" + sles-15-5: + publisher: "SUSE" + offer: "sles-15-sp5" + sku: "gen2" + sles-15-6: + publisher: "SUSE" + offer: "sles-15-sp6" + sku: "gen2" rhel-8-1-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "81sapha-gen2" - rhel-8-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "82sapha-gen2" - rhel-8-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "84sapha-gen2" - rhel-8-6-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "86sapha-gen2" - rhel-8-8-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "88sapha-gen2" - + rhel-8-10-sap-ha: + publisher: "RedHat" + offer: "RHEL-SAP-HA" + sku: "810sapha-gen2" rhel-9-0-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "90sapha-gen2" - rhel-9-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "92sapha-gen2" - - rhel-8-1-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "81sapapps-gen2" - - rhel-8-2-sap-applications: + rhel-9-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" - sku: "82sapapps-gen2" - - rhel-8-4-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "84sapapps-gen2" - - rhel-8-6-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "86sapapps-gen2" - - rhel-8-8-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "88sapapps-gen2" - - rhel-9-0-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "90sapapps-gen2" - - rhel-9-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "92sapapps-gen2" - - sles-15-sp3-sap: + sku: "94sapha-gen2" + sles-12-5-sap-ha: + publisher: "SUSE" + offer: "sles-sap-12-sp5" + sku: "gen2" + sles-15-1-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp1" + sku: "gen2" + sles-15-2-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp2" + sku: "gen2" + sles-15-3-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp3" sku: "gen2" - - sles-15-sp4-sap: + sles-15-4-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp4" sku: "gen2" - - sles-15-sp5-sap: + sles-15-5-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp5" sku: "gen2" + sles-15-6-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp6" + sku: "gen2" + sles-15-1-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp1-byos" + sku: "gen2" + sles-15-2-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp2-byos" + sku: "gen2" + sles-15-3-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp3-byos" + sku: "gen2" + sles-15-4-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp4-byos" + sku: "gen2" + sles-15-5-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp5-byos" + sku: "gen2" + sles-15-6-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp6-byos" + sku: "gen2" sap_vm_provision_msazure_vm_host_specifications_dictionary: diff --git a/deploy_scenarios/sap_s4hana_standard_maintplan/ansible_playbook.yml b/deploy_scenarios/sap_s4hana_standard_maintplan/ansible_playbook.yml index bf52186..b09de85 100644 --- a/deploy_scenarios/sap_s4hana_standard_maintplan/ansible_playbook.yml +++ b/deploy_scenarios/sap_s4hana_standard_maintplan/ansible_playbook.yml @@ -144,7 +144,6 @@ mode: '0755' loop: - "{{ sap_install_media_detect_source_directory }}" - - "{{ sap_hana_install_software_directory }}" - name: Install Python package manager pip3 to system Python ansible.builtin.package: diff --git a/deploy_scenarios/sap_s4hana_standard_maintplan/ansible_requirements.yml b/deploy_scenarios/sap_s4hana_standard_maintplan/ansible_requirements.yml index af7ed22..1454ec5 100644 --- a/deploy_scenarios/sap_s4hana_standard_maintplan/ansible_requirements.yml +++ b/deploy_scenarios/sap_s4hana_standard_maintplan/ansible_requirements.yml @@ -8,16 +8,16 @@ collections: version: 6.1.0 - name: fedora.linux_system_roles type: galaxy - version: 1.82.0 + version: 1.88.9 - name: community.sap_install type: galaxy - version: 1.4.0 + version: 1.5.0 - name: community.sap_launchpad type: galaxy - version: 1.1.0 + version: 1.1.1 - name: community.sap_infrastructure type: galaxy - version: 1.0.1 + version: 1.1.0 # - name: community.sap_operations # type: galaxy # version: 0.9.1 @@ -25,23 +25,23 @@ collections: # Collections for Infrastructure from Ansible Galaxy - name: cloud.terraform type: galaxy - version: 1.1.0 + version: 3.0.0 - name: amazon.aws type: galaxy - version: 7.2.0 + version: 9.0.0 - name: community.aws type: galaxy - version: 7.1.0 + version: 9.0.0 - name: azure.azcollection type: galaxy - version: 2.2.0 + version: 3.0.1 - name: google.cloud type: galaxy version: 1.1.3 # Replace with ibm.cloud in future, legacy Ansible Collection uses hidden on-the-fly Terraform files in /var/tmp/ansible/ibmcloud) - name: ibm.cloudcollection type: galaxy - version: 1.51.0 + version: 1.71.2 - name: ovirt.ovirt type: galaxy version: 3.1.2 @@ -53,21 +53,12 @@ collections: version: 3.0.0 - name: cloud.common type: galaxy - version: 3.0.0 + version: 4.0.0 # Collections from public repositories via HTTPS # - name: https://github.com/sap-linuxlab/community.sap_install.git # type: git # version: dev -# - name: https://github.com/sap-linuxlab/community.sap_launchpad.git -# type: git -# version: main -# - name: https://github.com/sap-linuxlab/community.sap_operations.git -# type: git -# version: main -# - name: https://github.com/ansible-collections/cloud.terraform.git -# type: git -# version: main # Collections from private repositories via use SSH (embedded GitHub PAT does not work) # Used for customised/forked Ansible Collections diff --git a/deploy_scenarios/sap_s4hana_standard_maintplan/optional/ansible_extravars_noninteractive.yml b/deploy_scenarios/sap_s4hana_standard_maintplan/optional/ansible_extravars_noninteractive.yml index 0db99a6..4d8f812 100755 --- a/deploy_scenarios/sap_s4hana_standard_maintplan/optional/ansible_extravars_noninteractive.yml +++ b/deploy_scenarios/sap_s4hana_standard_maintplan/optional/ansible_extravars_noninteractive.yml @@ -113,13 +113,14 @@ sap_vm_provision_ibmcloud_vpc_sg_names: "ENTER_STRING_VALUE_HERE,ENTER_STRING_VA #### sap_vm_provision_ibmcloud_api_key: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ibmcloud_resource_group_name: "ENTER_STRING_VALUE_HERE" # if ansible_to_terraform, use "new" -sap_vm_provision_ibmcloud_private_dns_instance_name: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_private_dns_instance_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform sap_vm_provision_ibmcloud_powervs_location: "ENTER_STRING_VALUE_HERE" -sap_vm_provision_ibmcloud_powervs_workspace_name: "ENTER_STRING_VALUE_HERE" -sap_vm_provision_ibmcloud_powervs_vlan_subnet_name: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_powervs_workspace_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform +sap_vm_provision_ibmcloud_powervs_vlan_subnet_name: "ENTER_STRING_VALUE_HERE" # not required when ansible_to_terraform sap_vm_provision_ibmcloud_powervs_host_os_image: "ENTER_STRING_VALUE_HERE" sap_vm_provision_bastion_user: "ENTER_STRING_VALUE_HERE" sap_vm_provision_bastion_ssh_port: "ENTER_STRING_VALUE_HERE" +# sap_vm_provision_ibmcloud_vpc_subnet_name: "ENTER_STRING_VALUE_HERE" # only for ansible_to_terraform, can be name or 'new' # Only for use when 'ansible' is value provided for variable sap_vm_provision_iac_type #### @@ -127,6 +128,7 @@ sap_vm_provision_bastion_public_ip: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ssh_bastion_private_key_file_path: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ssh_host_private_key_file_path: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ibmcloud_powervs_key_pair_name_ssh_host_public_key: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_private_dns_custom_resolver_ip: "ENTER_STRING_VALUE_HERE" # sap_vm_provision_ibmcloud_private_dns_resource_group_name: "" # optional, default use of sap_vm_provision_ibmcloud_resource_group_name sap_vm_provision_proxy_web_forward_proxy_ip: "ENTER_STRING_VALUE_HERE" # IP:Port only, no http:// prefix sap_vm_provision_proxy_web_forward_exclusions: "localhost,127.0.0.1,{{ sap_vm_provision_dns_root_domain }}" @@ -359,7 +361,7 @@ sap_id_user_password: 'ENTER_STRING_VALUE_HERE' sap_maintenance_planner_transaction_name: 'ENTER_STRING_VALUE_HERE' # Directory for SAP installation media -sap_software_download_directory: "ENTER_STRING_VALUE_HERE" +sap_install_media_detect_source_directory: "ENTER_STRING_VALUE_HERE" # e.g. /software #### diff --git a/deploy_scenarios/sap_solman_sapase_sandbox/ansible_extravars.yml b/deploy_scenarios/sap_solman_sapase_sandbox/ansible_extravars.yml index 3fff505..fe12bee 100755 --- a/deploy_scenarios/sap_solman_sapase_sandbox/ansible_extravars.yml +++ b/deploy_scenarios/sap_solman_sapase_sandbox/ansible_extravars.yml @@ -108,7 +108,7 @@ sap_swpm_templates_install_dictionary: - nw_config_java_ume - nw_config_host_agent - sap_os_linux_user - - solman_credentials_swpm1 + - nw_config_java_icm_credentials - solman_abap_swpm1 sap_swpm_inifile_dictionary: @@ -138,7 +138,7 @@ sap_swpm_templates_install_dictionary: - '51054655_1' # SAP Solution Manager 7.2 SR2 Installation Export I, ZIP. Contains EXP1, EXP2 (SAP:SOLMAN:SR27.2:DVD_EXPORT(1/2):SAP SOLUTION MANAGER 7.2 SR2 Installation Export DVD 1/2:Dxxxxxxxx_1) - '51054655_2' # SAP Solution Manager 7.2 SR2 Installation Export II, ZIP. Contains EXP3, EXP4 (SAP:SOLMAN:SR27.2:DVD_EXPORT(2/2):SAP SOLUTION MANAGER 7.2 SR2 Installation Export DVD 2/2:Dxxxxxxxx_2) # - '51054655_3' # SAP Solution Manager 7.2 SR2 Language, ZIP. (SAP:SAP:SAP:MM:SAP:Dxxxxxxxx_3) - - '51057804_1' # SAP ASE 16.0.04.06 RDBMS Linux on x86_64 64bit + - '51057961_1' # SAP ASE 16.0.04.06 HF1 RDBMS Linux on x86_64 64bit - 'ASEBC16004P_5-20012477.SAR' # SAP ASE 16.0 SP04 (160-04) FOR BUS. SUITE DBCLIENT with Patch (P_*) - 'SAPEXE_1000-80002573.SAR' # Kernel Part I (753) - 'SAPEXEDB_1000-80002616.SAR' # Kernel Part II (753), SAP ASE 16.0 FOR BUS. SUITE @@ -170,7 +170,7 @@ sap_swpm_templates_install_dictionary: - nw_config_ports - nw_config_host_agent #- sap_os_linux_user # Ignore, and SAP SWPM will auto-assign UID and GID - - solman_credentials_swpm1 + - nw_config_java_icm_credentials - nw_config_java_feature_template_ids sap_swpm_java_template_id_selected_list: @@ -209,7 +209,7 @@ sap_swpm_templates_install_dictionary: #- 'SAPJVM8_90-80000202.SAR' # SAP JVM 8.1 PL 90 - 'SAPJVM8_63-80000202.SAR' # SAP JVM 8.1 PL 63. See SAP Note 1680045 for 3 updates on SEP 17, 2020 related to SAP NetWeaver 7.5 JAVA before SP22 - "SAPJVM 8.1 archive you use has a patch level of 63 or lower" - '51054655_4' # SAP Solution Manager 7.2 SR2 - Java, ZIP. Uses SAP Netweaver 7.5 SP19 JAVA. Contains SOLMAN72_JAVA_UT (SAP:UT_SOLMAN:SR2SOLMAN72:SP00:*:*), JAVA_EXPORT (SAP:JEXPORT:SR2_72SOLMAN_2020S4:*:*:*), JAVA_EXPORT_JDMP (SAP:JDMP:SR2_72SOLMAN_2020S4:*:*:*), JAVA_J2EE_OSINDEP (SAP:J2EE-CD:SR2_72SOLMAN_2020S4:J2EE-CD:j2ee-cd:*), JAVA_J2EE_OSINDEP_J2EE_INST (SAP:J2EE-INST:SR2_72SOLMAN_2020S4:*:*:*), JAVA_J2EE_OSINDEP_UT (SAP:UT:SR2_72SOLMAN_2020S4:*:*:*) - - '51057804_1' # SAP ASE 16.0.04.06 RDBMS Linux on x86_64 64bit + - '51057961_1' # SAP ASE 16.0.04.06 HF1 RDBMS Linux on x86_64 64bit - 'ASEBC16004P_5-20012477.SAR' # SAP ASE 16.0 SP04 (160-04) FOR BUS. SUITE DBCLIENT with Patch (P_*) - 'SAPEXE_1000-80002573.SAR' # Kernel Part I (753) - 'SAPEXEDB_1000-80002616.SAR' # Kernel Part II (753), SAP ASE 16.0 FOR BUS. SUITE @@ -225,27 +225,43 @@ sap_swpm_templates_install_dictionary: sap_vm_provision_aws_ec2_vs_host_os_image_dictionary: rhel-8-1: "*RHEL-8.1*_HVM*x86_64*" - rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" + # rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" # removed rhel-8-4: "*RHEL-8.4*_HVM*x86_64*" rhel-8-6: "*RHEL-8.6*_HVM*x86_64*" rhel-8-8: "*RHEL-8.8*_HVM*x86_64*" + rhel-8-10: "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0: "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1: "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2: "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3: "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4: "*RHEL-9.4*_HVM*x86_64*" + sles-12-5: "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" # removed + # sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" # removed + # sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" # removed + sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6: "*suse-sles-15-sp6-v202*-hvm-ssd-x86_64*" + # rhel-7-7-sap-ha: "*RHEL-SAP-8.1.0*" # removed + # rhel-7-9-sap-ha: "*RHEL-SAP-8.1.0*" # removed rhel-8-1-sap-ha: "*RHEL-SAP-8.1.0*" rhel-8-2-sap-ha: "*RHEL-SAP-8.2.0*" rhel-8-4-sap-ha: "*RHEL-SAP-8.4.0*" rhel-8-6-sap-ha: "*RHEL-SAP-8.6.0*" rhel-8-8-sap-ha: "*RHEL-SAP-8.8.0*" + rhel-8-10-sap-ha: "*RHEL-SAP-8.10.0*" rhel-9-0-sap-ha: "*RHEL-SAP-9.0.0*" rhel-9-2-sap-ha: "*RHEL-SAP-9.2.0*" - sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" - sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" - sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" - sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + rhel-9-4-sap-ha: "*RHEL-SAP-9.4.0*" sles-12-5-sap-ha: "*suse-sles-sap-12-sp5-v202*-hvm-ssd-x86_64*" sles-15-1-sap-ha: "*suse-sles-sap-15-sp1-v202*-hvm-ssd-x86_64*" sles-15-2-sap-ha: "*suse-sles-sap-15-sp2-v202*-hvm-ssd-x86_64*" sles-15-3-sap-ha: "*suse-sles-sap-15-sp3-v202*-hvm-ssd-x86_64*" sles-15-4-sap-ha: "*suse-sles-sap-15-sp4-v202*-hvm-ssd-x86_64*" sles-15-5-sap-ha: "*suse-sles-sap-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha: "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" + sles-15-4-sap-ha-byos: "*suse-sles-sap-15-sp4-byos-v202*-hvm-ssd-x86_64*" + sles-15-5-sap-ha-byos: "*suse-sles-sap-15-sp5-byos-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha-byos: "*suse-sles-sap-15-sp6-byos-v202*-hvm-ssd-x86_64*" sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: @@ -306,42 +322,75 @@ sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: #### sap_vm_provision_gcp_ce_vm_host_os_image_dictionary: - rhel-8-latest: project: "rhel-cloud" family: "rhel-8" - - rhel-8-1-sap-ha: + rhel-9-latest: + project: "rhel-cloud" + family: "rhel-9" + sles-12-latest: + project: "suse-cloud" + family: "sles-12" + sles-15-latest: + project: "suse-cloud" + family: "sles-15" + # rhel-7-7-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-7-7-sap-ha" + rhel-7-9-sap-ha: project: "rhel-sap-cloud" - family: "rhel-8-1-sap-ha" - + family: "rhel-7-9-sap-ha" + # rhel-8-1-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-8-1-sap-ha" rhel-8-2-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-2-sap-ha" - rhel-8-4-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-4-sap-ha" - rhel-8-6-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-6-sap-ha" - - sles-15-latest: - project: "suse-cloud" - family: "sles-15" - - sles-15-sp3-sap: + sles-12-5-sap-ha: + project: "suse-sap-cloud" + family: "sles-12-sp5-sap" + # sles-15-1-sap-ha: # removed + # project: "suse-sap-cloud" + # family: "sles-15-sp1-sap" + sles-15-2-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp2-sap" + sles-15-3-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp3-sap" - - sles-15-sp4-sap: + sles-15-4-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp4-sap" - - sles-15-sp5-sap: + sles-15-5-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp5-sap" + sles-15-6-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp6-sap" + sles-12-5-sap-ha-byos: + project: "suse-byos-cloud" + family: "sles-12-sp5-sap-byos" + sles-15-2-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp2-sap-byos" + sles-15-3-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp3-sap-byos" + sles-15-4-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp4-sap-byos" + sles-15-5-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp5-sap-byos" + sles-15-6-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp6-sap-byos" sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: @@ -409,16 +458,31 @@ sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: sap_vm_provision_ibmcloud_vs_host_os_image_dictionary: rhel-8-4: ".*redhat.*8-4.*minimal.*amd64.*" rhel-8-6: ".*redhat.*8-6.*minimal.*amd64.*" + rhel-8-8: ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10: ".*redhat.*8-10.*minimal.*amd64.*" rhel-9-0: ".*redhat.*9-0.*minimal.*amd64.*" rhel-9-2: ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4: ".*redhat.*9-4.*minimal.*amd64.*" + sles-15-5: ".*sles.*15-5.*amd64-[0-9]" + sles-15-6: ".*sles.*15-6.*amd64-[0-9]" + # rhel-7-6-sap-ha: ".*redhat.*7-6.*amd64.*hana.*" # retrievable from deprecated list + # rhel-7-9-sap-ha: ".*redhat.*7-9.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-1-sap-ha: ".*redhat.*8-1.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-2-sap-ha: ".*redhat.*8-2.*amd64.*hana.*" # retrievable from deprecated list rhel-8-4-sap-ha: ".*redhat.*8-4.*amd64.*hana.*" rhel-8-6-sap-ha: ".*redhat.*8-6.*amd64.*hana.*" rhel-8-8-sap-ha: ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha: ".*redhat.*8-10.*amd64.*hana.*" rhel-9-0-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" - rhel-9-2-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha: ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha: ".*redhat.*9-4.*amd64.*hana.*" + # sles-12-4-sap-ha: ".*sles.*12-4.*amd64.*hana.*" # retrievable from deprecated list + # sles-12-5-sap-ha: ".*sles.*12-5.*amd64.*hana.*" # retrievable from deprecated list + # sles-15-1-sap-ha: ".*sles.*15-1.*amd64.*hana.*" # retrievable from deprecated list sles-15-3-sap-ha: ".*sles.*15-3.*amd64.*hana.*" sles-15-4-sap-ha: ".*sles.*15-4.*amd64.*hana.*" sles-15-5-sap-ha: ".*sles.*15-5.*amd64.*hana.*" + sles-15-6-sap-ha: ".*sles.*15-6.*amd64.*hana.*" sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: @@ -484,96 +548,186 @@ sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: #### sap_vm_provision_msazure_vm_host_os_image_dictionary: - + rhel-8-0: + publisher: "RedHat" + offer: "RHEL" + sku: "8-gen2" + rhel-8-1: + publisher: "RedHat" + offer: "RHEL" + sku: "81-gen2" + rhel-8-2: + publisher: "RedHat" + offer: "RHEL" + sku: "82-gen2" + rhel-8-3: + publisher: "RedHat" + offer: "RHEL" + sku: "83-gen2" rhel-8-4: publisher: "RedHat" offer: "RHEL" sku: "84-gen2" - + rhel-8-5: + publisher: "RedHat" + offer: "RHEL" + sku: "85-gen2" + rhel-8-6: + publisher: "RedHat" + offer: "RHEL" + sku: "86-gen2" + rhel-8-7: + publisher: "RedHat" + offer: "RHEL" + sku: "87-gen2" + rhel-8-8: + publisher: "RedHat" + offer: "RHEL" + sku: "88-gen2" + rhel-8-9: + publisher: "RedHat" + offer: "RHEL" + sku: "89-gen2" + rhel-8-10: + publisher: "RedHat" + offer: "RHEL" + sku: "810-gen2" + rhel-9-0: + publisher: "RedHat" + offer: "RHEL" + sku: "90-gen2" + rhel-9-1: + publisher: "RedHat" + offer: "RHEL" + sku: "91-gen2" + rhel-9-2: + publisher: "RedHat" + offer: "RHEL" + sku: "92-gen2" + rhel-9-3: + publisher: "RedHat" + offer: "RHEL" + sku: "93-gen2" + rhel-9-4: + publisher: "RedHat" + offer: "RHEL" + sku: "94-gen2" + sles-12-5: + publisher: "SUSE" + offer: "sles-12-sp5" + sku: "gen2" + sles-15-1: + publisher: "SUSE" + offer: "sles-15-sp1" + sku: "gen2" + sles-15-2: + publisher: "SUSE" + offer: "sles-15-sp2" + sku: "gen2" + sles-15-3: + publisher: "SUSE" + offer: "sles-15-sp3" + sku: "gen2" + sles-15-4: + publisher: "SUSE" + offer: "sles-15-sp4" + sku: "gen2" + sles-15-5: + publisher: "SUSE" + offer: "sles-15-sp5" + sku: "gen2" + sles-15-6: + publisher: "SUSE" + offer: "sles-15-sp6" + sku: "gen2" rhel-8-1-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "81sapha-gen2" - rhel-8-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "82sapha-gen2" - rhel-8-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "84sapha-gen2" - rhel-8-6-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "86sapha-gen2" - rhel-8-8-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "88sapha-gen2" - + rhel-8-10-sap-ha: + publisher: "RedHat" + offer: "RHEL-SAP-HA" + sku: "810sapha-gen2" rhel-9-0-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "90sapha-gen2" - rhel-9-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "92sapha-gen2" - - rhel-8-1-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "81sapapps-gen2" - - rhel-8-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "82sapapps-gen2" - - rhel-8-4-sap-applications: + rhel-9-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" - sku: "84sapapps-gen2" - - rhel-8-6-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "86sapapps-gen2" - - rhel-8-8-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "88sapapps-gen2" - - rhel-9-0-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "90sapapps-gen2" - - rhel-9-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "92sapapps-gen2" - - sles-15-sp3-sap: + sku: "94sapha-gen2" + sles-12-5-sap-ha: + publisher: "SUSE" + offer: "sles-sap-12-sp5" + sku: "gen2" + sles-15-1-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp1" + sku: "gen2" + sles-15-2-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp2" + sku: "gen2" + sles-15-3-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp3" sku: "gen2" - - sles-15-sp4-sap: + sles-15-4-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp4" sku: "gen2" - - sles-15-sp5-sap: + sles-15-5-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp5" sku: "gen2" + sles-15-6-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp6" + sku: "gen2" + sles-15-1-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp1-byos" + sku: "gen2" + sles-15-2-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp2-byos" + sku: "gen2" + sles-15-3-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp3-byos" + sku: "gen2" + sles-15-4-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp4-byos" + sku: "gen2" + sles-15-5-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp5-byos" + sku: "gen2" + sles-15-6-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp6-byos" + sku: "gen2" sap_vm_provision_msazure_vm_host_specifications_dictionary: diff --git a/deploy_scenarios/sap_solman_sapase_sandbox/ansible_requirements.yml b/deploy_scenarios/sap_solman_sapase_sandbox/ansible_requirements.yml index af7ed22..1454ec5 100644 --- a/deploy_scenarios/sap_solman_sapase_sandbox/ansible_requirements.yml +++ b/deploy_scenarios/sap_solman_sapase_sandbox/ansible_requirements.yml @@ -8,16 +8,16 @@ collections: version: 6.1.0 - name: fedora.linux_system_roles type: galaxy - version: 1.82.0 + version: 1.88.9 - name: community.sap_install type: galaxy - version: 1.4.0 + version: 1.5.0 - name: community.sap_launchpad type: galaxy - version: 1.1.0 + version: 1.1.1 - name: community.sap_infrastructure type: galaxy - version: 1.0.1 + version: 1.1.0 # - name: community.sap_operations # type: galaxy # version: 0.9.1 @@ -25,23 +25,23 @@ collections: # Collections for Infrastructure from Ansible Galaxy - name: cloud.terraform type: galaxy - version: 1.1.0 + version: 3.0.0 - name: amazon.aws type: galaxy - version: 7.2.0 + version: 9.0.0 - name: community.aws type: galaxy - version: 7.1.0 + version: 9.0.0 - name: azure.azcollection type: galaxy - version: 2.2.0 + version: 3.0.1 - name: google.cloud type: galaxy version: 1.1.3 # Replace with ibm.cloud in future, legacy Ansible Collection uses hidden on-the-fly Terraform files in /var/tmp/ansible/ibmcloud) - name: ibm.cloudcollection type: galaxy - version: 1.51.0 + version: 1.71.2 - name: ovirt.ovirt type: galaxy version: 3.1.2 @@ -53,21 +53,12 @@ collections: version: 3.0.0 - name: cloud.common type: galaxy - version: 3.0.0 + version: 4.0.0 # Collections from public repositories via HTTPS # - name: https://github.com/sap-linuxlab/community.sap_install.git # type: git # version: dev -# - name: https://github.com/sap-linuxlab/community.sap_launchpad.git -# type: git -# version: main -# - name: https://github.com/sap-linuxlab/community.sap_operations.git -# type: git -# version: main -# - name: https://github.com/ansible-collections/cloud.terraform.git -# type: git -# version: main # Collections from private repositories via use SSH (embedded GitHub PAT does not work) # Used for customised/forked Ansible Collections diff --git a/deploy_scenarios/sap_solman_sapase_sandbox/optional/ansible_extravars_noninteractive.yml b/deploy_scenarios/sap_solman_sapase_sandbox/optional/ansible_extravars_noninteractive.yml index a5f2e48..1ddb434 100755 --- a/deploy_scenarios/sap_solman_sapase_sandbox/optional/ansible_extravars_noninteractive.yml +++ b/deploy_scenarios/sap_solman_sapase_sandbox/optional/ansible_extravars_noninteractive.yml @@ -273,7 +273,7 @@ sap_id_user: "ENTER_STRING_VALUE_HERE" sap_id_user_password: 'ENTER_STRING_VALUE_HERE' # Directory for SAP installation media -sap_software_download_directory: "ENTER_STRING_VALUE_HERE" +sap_install_media_detect_source_directory: "ENTER_STRING_VALUE_HERE" # e.g. /software #### diff --git a/deploy_scenarios/sap_solman_saphana_sandbox/ansible_extravars.yml b/deploy_scenarios/sap_solman_saphana_sandbox/ansible_extravars.yml index aa40cb7..11971c2 100755 --- a/deploy_scenarios/sap_solman_saphana_sandbox/ansible_extravars.yml +++ b/deploy_scenarios/sap_solman_saphana_sandbox/ansible_extravars.yml @@ -155,7 +155,7 @@ sap_swpm_templates_install_dictionary: - nw_config_ports - nw_config_host_agent - sap_os_linux_user - - solman_credentials_swpm1 + - nw_config_java_icm_credentials - solman_abap_swpm1 sap_swpm_inifile_dictionary: @@ -215,7 +215,7 @@ sap_swpm_templates_install_dictionary: - nw_config_ports - nw_config_host_agent #- sap_os_linux_user # Ignore, and SAP SWPM will auto-assign UID and GID - - solman_credentials_swpm1 + - nw_config_java_icm_credentials - nw_config_java_feature_template_ids sap_swpm_java_template_id_selected_list: @@ -276,27 +276,43 @@ sap_swpm_templates_install_dictionary: sap_vm_provision_aws_ec2_vs_host_os_image_dictionary: rhel-8-1: "*RHEL-8.1*_HVM*x86_64*" - rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" + # rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" # removed rhel-8-4: "*RHEL-8.4*_HVM*x86_64*" rhel-8-6: "*RHEL-8.6*_HVM*x86_64*" rhel-8-8: "*RHEL-8.8*_HVM*x86_64*" + rhel-8-10: "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0: "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1: "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2: "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3: "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4: "*RHEL-9.4*_HVM*x86_64*" + sles-12-5: "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" # removed + # sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" # removed + # sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" # removed + sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6: "*suse-sles-15-sp6-v202*-hvm-ssd-x86_64*" + # rhel-7-7-sap-ha: "*RHEL-SAP-8.1.0*" # removed + # rhel-7-9-sap-ha: "*RHEL-SAP-8.1.0*" # removed rhel-8-1-sap-ha: "*RHEL-SAP-8.1.0*" rhel-8-2-sap-ha: "*RHEL-SAP-8.2.0*" rhel-8-4-sap-ha: "*RHEL-SAP-8.4.0*" rhel-8-6-sap-ha: "*RHEL-SAP-8.6.0*" rhel-8-8-sap-ha: "*RHEL-SAP-8.8.0*" + rhel-8-10-sap-ha: "*RHEL-SAP-8.10.0*" rhel-9-0-sap-ha: "*RHEL-SAP-9.0.0*" rhel-9-2-sap-ha: "*RHEL-SAP-9.2.0*" - sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" - sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" - sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" - sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + rhel-9-4-sap-ha: "*RHEL-SAP-9.4.0*" sles-12-5-sap-ha: "*suse-sles-sap-12-sp5-v202*-hvm-ssd-x86_64*" sles-15-1-sap-ha: "*suse-sles-sap-15-sp1-v202*-hvm-ssd-x86_64*" sles-15-2-sap-ha: "*suse-sles-sap-15-sp2-v202*-hvm-ssd-x86_64*" sles-15-3-sap-ha: "*suse-sles-sap-15-sp3-v202*-hvm-ssd-x86_64*" sles-15-4-sap-ha: "*suse-sles-sap-15-sp4-v202*-hvm-ssd-x86_64*" sles-15-5-sap-ha: "*suse-sles-sap-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha: "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" + sles-15-4-sap-ha-byos: "*suse-sles-sap-15-sp4-byos-v202*-hvm-ssd-x86_64*" + sles-15-5-sap-ha-byos: "*suse-sles-sap-15-sp5-byos-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha-byos: "*suse-sles-sap-15-sp6-byos-v202*-hvm-ssd-x86_64*" sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: @@ -367,42 +383,75 @@ sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: #### sap_vm_provision_gcp_ce_vm_host_os_image_dictionary: - rhel-8-latest: project: "rhel-cloud" family: "rhel-8" - - rhel-8-1-sap-ha: + rhel-9-latest: + project: "rhel-cloud" + family: "rhel-9" + sles-12-latest: + project: "suse-cloud" + family: "sles-12" + sles-15-latest: + project: "suse-cloud" + family: "sles-15" + # rhel-7-7-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-7-7-sap-ha" + rhel-7-9-sap-ha: project: "rhel-sap-cloud" - family: "rhel-8-1-sap-ha" - + family: "rhel-7-9-sap-ha" + # rhel-8-1-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-8-1-sap-ha" rhel-8-2-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-2-sap-ha" - rhel-8-4-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-4-sap-ha" - rhel-8-6-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-6-sap-ha" - - sles-15-latest: - project: "suse-cloud" - family: "sles-15" - - sles-15-sp3-sap: + sles-12-5-sap-ha: + project: "suse-sap-cloud" + family: "sles-12-sp5-sap" + # sles-15-1-sap-ha: # removed + # project: "suse-sap-cloud" + # family: "sles-15-sp1-sap" + sles-15-2-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp2-sap" + sles-15-3-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp3-sap" - - sles-15-sp4-sap: + sles-15-4-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp4-sap" - - sles-15-sp5-sap: + sles-15-5-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp5-sap" + sles-15-6-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp6-sap" + sles-12-5-sap-ha-byos: + project: "suse-byos-cloud" + family: "sles-12-sp5-sap-byos" + sles-15-2-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp2-sap-byos" + sles-15-3-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp3-sap-byos" + sles-15-4-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp4-sap-byos" + sles-15-5-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp5-sap-byos" + sles-15-6-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp6-sap-byos" sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: @@ -483,16 +532,31 @@ sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: sap_vm_provision_ibmcloud_vs_host_os_image_dictionary: rhel-8-4: ".*redhat.*8-4.*minimal.*amd64.*" rhel-8-6: ".*redhat.*8-6.*minimal.*amd64.*" + rhel-8-8: ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10: ".*redhat.*8-10.*minimal.*amd64.*" rhel-9-0: ".*redhat.*9-0.*minimal.*amd64.*" rhel-9-2: ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4: ".*redhat.*9-4.*minimal.*amd64.*" + sles-15-5: ".*sles.*15-5.*amd64-[0-9]" + sles-15-6: ".*sles.*15-6.*amd64-[0-9]" + # rhel-7-6-sap-ha: ".*redhat.*7-6.*amd64.*hana.*" # retrievable from deprecated list + # rhel-7-9-sap-ha: ".*redhat.*7-9.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-1-sap-ha: ".*redhat.*8-1.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-2-sap-ha: ".*redhat.*8-2.*amd64.*hana.*" # retrievable from deprecated list rhel-8-4-sap-ha: ".*redhat.*8-4.*amd64.*hana.*" rhel-8-6-sap-ha: ".*redhat.*8-6.*amd64.*hana.*" rhel-8-8-sap-ha: ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha: ".*redhat.*8-10.*amd64.*hana.*" rhel-9-0-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" - rhel-9-2-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha: ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha: ".*redhat.*9-4.*amd64.*hana.*" + # sles-12-4-sap-ha: ".*sles.*12-4.*amd64.*hana.*" # retrievable from deprecated list + # sles-12-5-sap-ha: ".*sles.*12-5.*amd64.*hana.*" # retrievable from deprecated list + # sles-15-1-sap-ha: ".*sles.*15-1.*amd64.*hana.*" # retrievable from deprecated list sles-15-3-sap-ha: ".*sles.*15-3.*amd64.*hana.*" sles-15-4-sap-ha: ".*sles.*15-4.*amd64.*hana.*" sles-15-5-sap-ha: ".*sles.*15-5.*amd64.*hana.*" + sles-15-6-sap-ha: ".*sles.*15-6.*amd64.*hana.*" sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: @@ -571,96 +635,186 @@ sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: #### sap_vm_provision_msazure_vm_host_os_image_dictionary: - + rhel-8-0: + publisher: "RedHat" + offer: "RHEL" + sku: "8-gen2" + rhel-8-1: + publisher: "RedHat" + offer: "RHEL" + sku: "81-gen2" + rhel-8-2: + publisher: "RedHat" + offer: "RHEL" + sku: "82-gen2" + rhel-8-3: + publisher: "RedHat" + offer: "RHEL" + sku: "83-gen2" rhel-8-4: publisher: "RedHat" offer: "RHEL" sku: "84-gen2" - + rhel-8-5: + publisher: "RedHat" + offer: "RHEL" + sku: "85-gen2" + rhel-8-6: + publisher: "RedHat" + offer: "RHEL" + sku: "86-gen2" + rhel-8-7: + publisher: "RedHat" + offer: "RHEL" + sku: "87-gen2" + rhel-8-8: + publisher: "RedHat" + offer: "RHEL" + sku: "88-gen2" + rhel-8-9: + publisher: "RedHat" + offer: "RHEL" + sku: "89-gen2" + rhel-8-10: + publisher: "RedHat" + offer: "RHEL" + sku: "810-gen2" + rhel-9-0: + publisher: "RedHat" + offer: "RHEL" + sku: "90-gen2" + rhel-9-1: + publisher: "RedHat" + offer: "RHEL" + sku: "91-gen2" + rhel-9-2: + publisher: "RedHat" + offer: "RHEL" + sku: "92-gen2" + rhel-9-3: + publisher: "RedHat" + offer: "RHEL" + sku: "93-gen2" + rhel-9-4: + publisher: "RedHat" + offer: "RHEL" + sku: "94-gen2" + sles-12-5: + publisher: "SUSE" + offer: "sles-12-sp5" + sku: "gen2" + sles-15-1: + publisher: "SUSE" + offer: "sles-15-sp1" + sku: "gen2" + sles-15-2: + publisher: "SUSE" + offer: "sles-15-sp2" + sku: "gen2" + sles-15-3: + publisher: "SUSE" + offer: "sles-15-sp3" + sku: "gen2" + sles-15-4: + publisher: "SUSE" + offer: "sles-15-sp4" + sku: "gen2" + sles-15-5: + publisher: "SUSE" + offer: "sles-15-sp5" + sku: "gen2" + sles-15-6: + publisher: "SUSE" + offer: "sles-15-sp6" + sku: "gen2" rhel-8-1-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "81sapha-gen2" - rhel-8-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "82sapha-gen2" - rhel-8-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "84sapha-gen2" - rhel-8-6-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "86sapha-gen2" - rhel-8-8-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "88sapha-gen2" - + rhel-8-10-sap-ha: + publisher: "RedHat" + offer: "RHEL-SAP-HA" + sku: "810sapha-gen2" rhel-9-0-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "90sapha-gen2" - rhel-9-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "92sapha-gen2" - - rhel-8-1-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "81sapapps-gen2" - - rhel-8-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "82sapapps-gen2" - - rhel-8-4-sap-applications: + rhel-9-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" - sku: "84sapapps-gen2" - - rhel-8-6-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "86sapapps-gen2" - - rhel-8-8-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "88sapapps-gen2" - - rhel-9-0-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "90sapapps-gen2" - - rhel-9-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "92sapapps-gen2" - - sles-15-sp3-sap: + sku: "94sapha-gen2" + sles-12-5-sap-ha: + publisher: "SUSE" + offer: "sles-sap-12-sp5" + sku: "gen2" + sles-15-1-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp1" + sku: "gen2" + sles-15-2-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp2" + sku: "gen2" + sles-15-3-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp3" sku: "gen2" - - sles-15-sp4-sap: + sles-15-4-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp4" sku: "gen2" - - sles-15-sp5-sap: + sles-15-5-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp5" sku: "gen2" + sles-15-6-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp6" + sku: "gen2" + sles-15-1-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp1-byos" + sku: "gen2" + sles-15-2-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp2-byos" + sku: "gen2" + sles-15-3-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp3-byos" + sku: "gen2" + sles-15-4-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp4-byos" + sku: "gen2" + sles-15-5-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp5-byos" + sku: "gen2" + sles-15-6-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp6-byos" + sku: "gen2" sap_vm_provision_msazure_vm_host_specifications_dictionary: diff --git a/deploy_scenarios/sap_solman_saphana_sandbox/ansible_requirements.yml b/deploy_scenarios/sap_solman_saphana_sandbox/ansible_requirements.yml index af7ed22..1454ec5 100644 --- a/deploy_scenarios/sap_solman_saphana_sandbox/ansible_requirements.yml +++ b/deploy_scenarios/sap_solman_saphana_sandbox/ansible_requirements.yml @@ -8,16 +8,16 @@ collections: version: 6.1.0 - name: fedora.linux_system_roles type: galaxy - version: 1.82.0 + version: 1.88.9 - name: community.sap_install type: galaxy - version: 1.4.0 + version: 1.5.0 - name: community.sap_launchpad type: galaxy - version: 1.1.0 + version: 1.1.1 - name: community.sap_infrastructure type: galaxy - version: 1.0.1 + version: 1.1.0 # - name: community.sap_operations # type: galaxy # version: 0.9.1 @@ -25,23 +25,23 @@ collections: # Collections for Infrastructure from Ansible Galaxy - name: cloud.terraform type: galaxy - version: 1.1.0 + version: 3.0.0 - name: amazon.aws type: galaxy - version: 7.2.0 + version: 9.0.0 - name: community.aws type: galaxy - version: 7.1.0 + version: 9.0.0 - name: azure.azcollection type: galaxy - version: 2.2.0 + version: 3.0.1 - name: google.cloud type: galaxy version: 1.1.3 # Replace with ibm.cloud in future, legacy Ansible Collection uses hidden on-the-fly Terraform files in /var/tmp/ansible/ibmcloud) - name: ibm.cloudcollection type: galaxy - version: 1.51.0 + version: 1.71.2 - name: ovirt.ovirt type: galaxy version: 3.1.2 @@ -53,21 +53,12 @@ collections: version: 3.0.0 - name: cloud.common type: galaxy - version: 3.0.0 + version: 4.0.0 # Collections from public repositories via HTTPS # - name: https://github.com/sap-linuxlab/community.sap_install.git # type: git # version: dev -# - name: https://github.com/sap-linuxlab/community.sap_launchpad.git -# type: git -# version: main -# - name: https://github.com/sap-linuxlab/community.sap_operations.git -# type: git -# version: main -# - name: https://github.com/ansible-collections/cloud.terraform.git -# type: git -# version: main # Collections from private repositories via use SSH (embedded GitHub PAT does not work) # Used for customised/forked Ansible Collections diff --git a/deploy_scenarios/sap_solman_saphana_sandbox/optional/ansible_extravars_noninteractive.yml b/deploy_scenarios/sap_solman_saphana_sandbox/optional/ansible_extravars_noninteractive.yml index fd90ebb..7940049 100755 --- a/deploy_scenarios/sap_solman_saphana_sandbox/optional/ansible_extravars_noninteractive.yml +++ b/deploy_scenarios/sap_solman_saphana_sandbox/optional/ansible_extravars_noninteractive.yml @@ -274,7 +274,7 @@ sap_id_user: "ENTER_STRING_VALUE_HERE" sap_id_user_password: 'ENTER_STRING_VALUE_HERE' # Directory for SAP installation media -sap_software_download_directory: "ENTER_STRING_VALUE_HERE" +sap_install_media_detect_source_directory: "ENTER_STRING_VALUE_HERE" # e.g. /software #### diff --git a/docs/README.md b/docs/README.md index 573128f..b6e0199 100644 --- a/docs/README.md +++ b/docs/README.md @@ -89,7 +89,7 @@ The Ansible Playbooks for SAP are designed for Linux operating systems, the mini _Additional notes regarding OS Editions and Versions:_ - SLES with HAE is not compatible due to missing OS Packages for SAP -- RHEL for _SAP Applications_ may not have imcompatibility, depending on selected scenario, due to missing OS Packages for SAP HANA, High Availability and extended patching (EUS/E4S) +- RHEL for _SAP Applications_ may not have incompatibility, depending on selected scenario, due to missing OS Packages for SAP HANA, High Availability and extended patching (EUS/E4S) - RHEL for _SAP Solutions_ may be labelled 'RHEL for SAP with High Availability and Update Services (HA-US)' on Cloud Hyperscalers Assumptions for executing the Ansible Roles from this Ansible Collection include: diff --git a/special_actions/sap_download_install_media/ansible_extravars.yml b/special_actions/sap_download_install_media/ansible_extravars.yml index f2ee9bf..dd0cf50 100644 --- a/special_actions/sap_download_install_media/ansible_extravars.yml +++ b/special_actions/sap_download_install_media/ansible_extravars.yml @@ -478,16 +478,16 @@ sap_software_templates_dictionary: softwarecenter_search_list_ppc64le: - 'SAPCAR_1115-70006238.EXE' - - 'IMDB_SERVER20_077_0-80002031.SAR' + - 'IMDB_SERVER20_077_0-80002046.SAR' - 'IMDB_LCAPPS_2067P_400-80002183.SAR' - 'IMDB_AFL20_067P_400-80002045.SAR' - - 'IMDB_CLIENT20_021_31-80002082.SAR' # SAP HANA Client - - 'SWPM20SP19_1-80003424.SAR' - - 'igsexe_4-70005417.sar' # IGS 7.81 + - 'IMDB_CLIENT20_021_31-80002095.SAR' # SAP HANA Client + - 'SWPM20SP19_1-80003426.SAR' + - 'igsexe_4-70005446.sar' # IGS 7.81 - 'igshelper_17-10010245.sar' - - 'SAPEXE_51-70007807.SAR' # Kernel Part I (785) - - 'SAPEXEDB_51-70007806.SAR' # Kernel Part II (785), SAP HANA 2.0 - - 'SAPHOSTAGENT62_62-80004822.SAR' # SAP Host Agent 7.22 + - 'SAPEXE_51-70007832.SAR' # Kernel Part I (785) + - 'SAPEXEDB_51-70007831.SAR' # Kernel Part II (785), SAP HANA 2.0 + - 'SAPHOSTAGENT62_62-80004831.SAR' # SAP Host Agent 7.22 - 'BW4HANA400_INST_EXPORT_1.zip' - 'BW4HANA400_INST_EXPORT_2.zip' - 'BW4HANA400_INST_EXPORT_3.zip' @@ -786,7 +786,7 @@ sap_software_templates_dictionary: - 'igsexe_13-80003187.sar' # IGS 7.53 - 'igshelper_17-10010245.sar' - 'SYBCTRL_1423-80002616.SAR' - - '51057804_1' # SAP ASE 16.0.04.06 RDBMS Linux on x86_64 64bit + - '51057961_1' # SAP ASE 16.0.04.06 HF1 RDBMS Linux on x86_64 64bit - 'ASEBC16004P_5-20012477.SAR' # SAP ASE 16.0 SP04 (160-04) FOR BUS. SUITE DBCLIENT with Patch (P_*) - '51050708_1' # SAP ERP 6.0 EHP8 Installation Export 1/4, Self-extract RAR EXE - '51050708_2' @@ -1033,7 +1033,7 @@ sap_software_templates_dictionary: - 'igsexe_13-80003187.sar' # IGS 7.53 - 'igshelper_17-10010245.sar' - 'SYBCTRL_1423-80002616.SAR' - - '51057804_1' # SAP ASE 16.0.04.06 RDBMS Linux on x86_64 64bit + - '51057961_1' # SAP ASE 16.0.04.06 HF1 RDBMS Linux on x86_64 64bit - 'ASEBC16004P_5-20012477.SAR' # SAP ASE 16.0 SP04 (160-04) FOR BUS. SUITE DBCLIENT with Patch (P_*) - '51051806_1' # NetWeaver AS ABAP 7.52 Innovation Pkg - Installation Exp 1/2, RAR - '51051806_2' # NetWeaver AS ABAP 7.52 Innovation Pkg - Installation Exp 2/2, RAR @@ -1055,7 +1055,7 @@ sap_software_templates_dictionary: - 'igsexe_13-80003187.sar' # IGS 7.53 - 'igshelper_17-10010245.sar' - 'SYBCTRL_1423-80002616.SAR' - - '51057804_1' # SAP ASE 16.0.04.06 RDBMS Linux on x86_64 64bit + - '51057961_1' # SAP ASE 16.0.04.06 HF1 RDBMS Linux on x86_64 64bit - 'ASEBC16004P_5-20012477.SAR' # SAP ASE 16.0 SP04 (160-04) FOR BUS. SUITE DBCLIENT with Patch (P_*) - '51050829_3' # SAP Netweaver 7.5 Installation Export, ZIP # - '51050829_4' # NW 7.5 Language 1/2 @@ -1150,7 +1150,7 @@ sap_software_templates_dictionary: - 'SAPHOSTAGENT61_61-80004822.SAR' # SAP Host Agent 7.22 - 'SAPJVM8_90-80000202.SAR' # SAP JVM 8.1 - '51055106' # SAP Netweaver 7.5 SP22 Java, ZIP. Contains JAVA_EXPORT (SAP:JEXPORT:750:SP22:*:*), JAVA_EXPORT_JDMP (SAP:JDMP:750:SP22:*:SW-LABEL), JAVA_J2EE_OSINDEP (SAP:J2EE-CD:750:J2EE-CD:j2ee-cd:*), JAVA_J2EE_OSINDEP_J2EE_INST (SAP:J2EE-INST:750:SP22:*:*), JAVA_J2EE_OSINDEP_UT (SAP:UT:750:SP22:*:*) - - '51057804_1' # SAP ASE 16.0.04.06 RDBMS Linux on x86_64 64bit + - '51057961_1' # SAP ASE 16.0.04.06 HF1 RDBMS Linux on x86_64 64bit - 'ASEBC16004P_5-20012477.SAR' # SAP ASE 16.0 SP04 (160-04) FOR BUS. SUITE DBCLIENT with Patch (P_*) # Not available for IBM Power Little Endian (ppc64le), leave code to keep similarity of code structure across all Ansible Playbooks for SAP @@ -1300,7 +1300,7 @@ sap_software_templates_dictionary: - 'igsexe_13-80003187.sar' # IGS 7.53 - 'igshelper_17-10010245.sar' - 'SYBCTRL_1423-80002616.SAR' - - '51057804_1' # SAP ASE 16.0.04.06 RDBMS Linux on x86_64 64bit + - '51057961_1' # SAP ASE 16.0.04.06 HF1 RDBMS Linux on x86_64 64bit - 'ASEBC16004P_5-20012477.SAR' # SAP ASE 16.0 SP04 (160-04) FOR BUS. SUITE DBCLIENT with Patch (P_*) - '51053216_1' # IDES SAP ERP 6.0 EHP8 - INSTALL. EXP. (1/2) 1/22 - '51053216_2' @@ -1369,3 +1369,46 @@ sap_software_templates_dictionary: # Not available for IBM Power Little Endian (ppc64le), leave code to keep similarity of code structure across all Ansible Playbooks for SAP softwarecenter_search_list_ppc64le: - 'SAPCAR_1115-70006238.EXE' + + + sap_hana_2_sps08_install: + + softwarecenter_search_list_saphana_x86_64: + - 'SAPCAR_1115-70006178.EXE' + - 'IMDB_SERVER20_080_0-80002031.SAR' + - 'SAPHOSTAGENT62_62-80004822.SAR' # SAP Host Agent 7.22 + - 'SAPHANACOCKPIT17_1-70002299.SAR' + + softwarecenter_search_list_saphana_ppc64le: + - 'SAPCAR_1115-70006238.EXE' + - 'IMDB_SERVER20_080_0-80002046.SAR' + - 'SAPHOSTAGENT62_62-80004831.SAR' # SAP Host Agent 7.22 + - 'SAPHANACOCKPIT17_1-70002300.SAR' + + sap_hana_2_sps07_install: + + softwarecenter_search_list_saphana_x86_64: + - 'SAPCAR_1115-70006178.EXE' + - 'IMDB_SERVER20_077_0-80002031.SAR' + - 'SAPHOSTAGENT62_62-80004822.SAR' # SAP Host Agent 7.22 + - 'SAPHANACOCKPIT17_1-70002299.SAR' + + softwarecenter_search_list_saphana_ppc64le: + - 'SAPCAR_1115-70006238.EXE' + - 'IMDB_SERVER20_077_0-80002046.SAR' + - 'SAPHOSTAGENT62_62-80004831.SAR' # SAP Host Agent 7.22 + - 'SAPHANACOCKPIT17_1-70002300.SAR' + + sap_hana_2_sps06_install: + + softwarecenter_search_list_saphana_x86_64: + - 'SAPCAR_1115-70006178.EXE' + - 'IMDB_SERVER20_067_4-80002031.SAR' + - 'SAPHOSTAGENT61_61-80004822.SAR' # SAP Host Agent 7.22 + - 'SAPHANACOCKPIT17_1-70002299.SAR' + + softwarecenter_search_list_saphana_ppc64le: + - 'SAPCAR_1115-70006238.EXE' + - 'IMDB_SERVER20_067_4-80002046.SAR' + - 'SAPHOSTAGENT61_61-80004831.SAR' # SAP Host Agent 7.22 + - 'SAPHANACOCKPIT17_1-70002300.SAR' diff --git a/special_actions/sap_download_install_media/ansible_requirements.yml b/special_actions/sap_download_install_media/ansible_requirements.yml index 4b764ef..de738b6 100644 --- a/special_actions/sap_download_install_media/ansible_requirements.yml +++ b/special_actions/sap_download_install_media/ansible_requirements.yml @@ -6,7 +6,7 @@ collections: # - name: community.general - name: community.sap_launchpad type: galaxy - version: 1.1.0 + version: 1.1.1 # Collections from public repositories via HTTPS # - name: https://github.com/sap-linuxlab/community.sap_launchpad.git diff --git a/special_actions/sap_sda/ansible_extravars.yml b/special_actions/sap_sda/ansible_extravars.yml index a39020a..9a56f13 100644 --- a/special_actions/sap_sda/ansible_extravars.yml +++ b/special_actions/sap_sda/ansible_extravars.yml @@ -25,7 +25,7 @@ sap_software_templates_dictionary: - 'SAPCAR_1115-70006178.EXE' - 'SWPM10SP42_2-20009701.SAR' - 'SAPHOSTAGENT61_61-80004822.SAR' # SAP Host Agent 7.22 Linux x86_64 - - 'SMDA720_SP14_15-80003641.SAR' # SAP Diagnostics Agent 7.53, OS Independent, for SAP SolMan 7.2 SP12 + - 'SMDA720_SP14_21-80003641.SAR' # SAP Diagnostics Agent 7.53, OS Independent, for SAP SolMan 7.2 SP12 - 'SAPJVM8_96-80000202.SAR' # SAP JVM 8.1 - 'SAPEXE_1100-80002573.SAR' # Kernel Part I (753) - 'SAPEXEDB_1100-80002572.SAR' # Kernel Part II (753), SAP HANA @@ -34,7 +34,7 @@ sap_software_templates_dictionary: - 'SAPCAR_1115-70006238.EXE' - 'SWPM10SP42_2-70002492.SAR' - 'SAPHOSTAGENT61_61-80004831.SAR' # SAP Host Agent 7.22 Linux x86_64 - - 'SMDA720_SP14_15-80003641.SAR' # SAP Diagnostics Agent 7.53, OS Independent, for SAP SolMan 7.2 SP12 + - 'SMDA720_SP14_21-80003641.SAR' # SAP Diagnostics Agent 7.53, OS Independent, for SAP SolMan 7.2 SP12 - 'SAPJVM8_96-70001621.SAR' # SAP JVM 8.1 - 'SAPEXE_1100-80002630.SAR' # Kernel Part I (753) - 'SAPEXEDB_1100-80002629.SAR' # Kernel Part II (753), SAP HANA diff --git a/special_actions/sap_sda/ansible_requirements.yml b/special_actions/sap_sda/ansible_requirements.yml index c8ca658..e096256 100644 --- a/special_actions/sap_sda/ansible_requirements.yml +++ b/special_actions/sap_sda/ansible_requirements.yml @@ -6,10 +6,10 @@ collections: # - name: community.general - name: community.sap_install type: galaxy - version: 1.4.0 + version: 1.5.0 - name: community.sap_launchpad type: galaxy - version: 1.1.0 + version: 1.1.1 # Collections from public repositories via HTTPS # - name: https://github.com/sap-linuxlab/community.sap_launchpad.git diff --git a/special_actions/sap_system_copy_export/ansible_requirements.yml b/special_actions/sap_system_copy_export/ansible_requirements.yml index 5bb5ae9..b693243 100644 --- a/special_actions/sap_system_copy_export/ansible_requirements.yml +++ b/special_actions/sap_system_copy_export/ansible_requirements.yml @@ -6,7 +6,7 @@ collections: # - name: community.general - name: community.sap_install type: galaxy - version: 1.4.0 + version: 1.5.0 # Collections from public repositories via HTTPS # - name: https://github.com/sap-linuxlab/community.sap_launchpad.git diff --git a/special_actions/sap_system_copy_restore_hana_sandbox/ansible_requirements.yml b/special_actions/sap_system_copy_restore_hana_sandbox/ansible_requirements.yml index 5bb5ae9..b693243 100644 --- a/special_actions/sap_system_copy_restore_hana_sandbox/ansible_requirements.yml +++ b/special_actions/sap_system_copy_restore_hana_sandbox/ansible_requirements.yml @@ -6,7 +6,7 @@ collections: # - name: community.general - name: community.sap_install type: galaxy - version: 1.4.0 + version: 1.5.0 # Collections from public repositories via HTTPS # - name: https://github.com/sap-linuxlab/community.sap_launchpad.git diff --git a/special_actions/sap_webdispatcher_standalone/ansible_extravars.yml b/special_actions/sap_webdispatcher_standalone/ansible_extravars.yml index 66fb3f3..8393a3f 100755 --- a/special_actions/sap_webdispatcher_standalone/ansible_extravars.yml +++ b/special_actions/sap_webdispatcher_standalone/ansible_extravars.yml @@ -182,7 +182,7 @@ sap_swpm_templates_install_dictionary: - nw_config_webdisp_generic - nw_config_host_agent - sap_os_linux_user - - solman_credentials_swpm1 # use ICM Auth Web Admin password + - nw_config_java_icm_credentials # use ICM Auth Web Admin password sap_swpm_inifile_dictionary: @@ -213,7 +213,7 @@ sap_swpm_templates_install_dictionary: - nw_config_webdisp_generic - nw_config_host_agent - sap_os_linux_user - - solman_credentials_swpm1 # use ICM Auth Web Admin password + - nw_config_java_icm_credentials # use ICM Auth Web Admin password sap_swpm_inifile_dictionary: @@ -238,27 +238,43 @@ sap_swpm_templates_install_dictionary: sap_vm_provision_aws_ec2_vs_host_os_image_dictionary: rhel-8-1: "*RHEL-8.1*_HVM*x86_64*" - rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" + # rhel-8-2: "*RHEL-8.2*_HVM*x86_64*" # removed rhel-8-4: "*RHEL-8.4*_HVM*x86_64*" rhel-8-6: "*RHEL-8.6*_HVM*x86_64*" rhel-8-8: "*RHEL-8.8*_HVM*x86_64*" + rhel-8-10: "*RHEL-8.10*_HVM*x86_64*" + rhel-9-0: "*RHEL-9.0*_HVM*x86_64*" + rhel-9-1: "*RHEL-9.1*_HVM*x86_64*" + rhel-9-2: "*RHEL-9.2*_HVM*x86_64*" + rhel-9-3: "*RHEL-9.3*_HVM*x86_64*" + rhel-9-4: "*RHEL-9.4*_HVM*x86_64*" + sles-12-5: "*suse-sles-12-sp5-v202*-hvm-ssd-x86_64*" + # sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" # removed + # sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" # removed + # sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" # removed + sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6: "*suse-sles-15-sp6-v202*-hvm-ssd-x86_64*" + # rhel-7-7-sap-ha: "*RHEL-SAP-8.1.0*" # removed + # rhel-7-9-sap-ha: "*RHEL-SAP-8.1.0*" # removed rhel-8-1-sap-ha: "*RHEL-SAP-8.1.0*" rhel-8-2-sap-ha: "*RHEL-SAP-8.2.0*" rhel-8-4-sap-ha: "*RHEL-SAP-8.4.0*" rhel-8-6-sap-ha: "*RHEL-SAP-8.6.0*" rhel-8-8-sap-ha: "*RHEL-SAP-8.8.0*" + rhel-8-10-sap-ha: "*RHEL-SAP-8.10.0*" rhel-9-0-sap-ha: "*RHEL-SAP-9.0.0*" rhel-9-2-sap-ha: "*RHEL-SAP-9.2.0*" - sles-15-2: "*suse-sles-15-sp2-v202*-hvm-ssd-x86_64*" - sles-15-3: "*suse-sles-15-sp3-v202*-hvm-ssd-x86_64*" - sles-15-4: "*suse-sles-15-sp4-v202*-hvm-ssd-x86_64*" - sles-15-5: "*suse-sles-15-sp5-v202*-hvm-ssd-x86_64*" + rhel-9-4-sap-ha: "*RHEL-SAP-9.4.0*" sles-12-5-sap-ha: "*suse-sles-sap-12-sp5-v202*-hvm-ssd-x86_64*" sles-15-1-sap-ha: "*suse-sles-sap-15-sp1-v202*-hvm-ssd-x86_64*" sles-15-2-sap-ha: "*suse-sles-sap-15-sp2-v202*-hvm-ssd-x86_64*" sles-15-3-sap-ha: "*suse-sles-sap-15-sp3-v202*-hvm-ssd-x86_64*" sles-15-4-sap-ha: "*suse-sles-sap-15-sp4-v202*-hvm-ssd-x86_64*" sles-15-5-sap-ha: "*suse-sles-sap-15-sp5-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha: "*suse-sles-sap-15-sp6-v202*-hvm-ssd-x86_64*" + sles-15-4-sap-ha-byos: "*suse-sles-sap-15-sp4-byos-v202*-hvm-ssd-x86_64*" + sles-15-5-sap-ha-byos: "*suse-sles-sap-15-sp5-byos-v202*-hvm-ssd-x86_64*" + sles-15-6-sap-ha-byos: "*suse-sles-sap-15-sp6-byos-v202*-hvm-ssd-x86_64*" sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: @@ -300,42 +316,75 @@ sap_vm_provision_aws_ec2_vs_host_specifications_dictionary: #### sap_vm_provision_gcp_ce_vm_host_os_image_dictionary: - rhel-8-latest: project: "rhel-cloud" family: "rhel-8" - - rhel-8-1-sap-ha: + rhel-9-latest: + project: "rhel-cloud" + family: "rhel-9" + sles-12-latest: + project: "suse-cloud" + family: "sles-12" + sles-15-latest: + project: "suse-cloud" + family: "sles-15" + # rhel-7-7-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-7-7-sap-ha" + rhel-7-9-sap-ha: project: "rhel-sap-cloud" - family: "rhel-8-1-sap-ha" - + family: "rhel-7-9-sap-ha" + # rhel-8-1-sap-ha: # removed + # project: "rhel-sap-cloud" + # family: "rhel-8-1-sap-ha" rhel-8-2-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-2-sap-ha" - rhel-8-4-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-4-sap-ha" - rhel-8-6-sap-ha: project: "rhel-sap-cloud" family: "rhel-8-6-sap-ha" - - sles-15-latest: - project: "suse-cloud" - family: "sles-15" - - sles-15-sp3-sap: + sles-12-5-sap-ha: + project: "suse-sap-cloud" + family: "sles-12-sp5-sap" + # sles-15-1-sap-ha: # removed + # project: "suse-sap-cloud" + # family: "sles-15-sp1-sap" + sles-15-2-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp2-sap" + sles-15-3-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp3-sap" - - sles-15-sp4-sap: + sles-15-4-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp4-sap" - - sles-15-sp5-sap: + sles-15-5-sap-ha: project: "suse-sap-cloud" family: "sles-15-sp5-sap" + sles-15-6-sap-ha: + project: "suse-sap-cloud" + family: "sles-15-sp6-sap" + sles-12-5-sap-ha-byos: + project: "suse-byos-cloud" + family: "sles-12-sp5-sap-byos" + sles-15-2-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp2-sap-byos" + sles-15-3-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp3-sap-byos" + sles-15-4-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp4-sap-byos" + sles-15-5-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp5-sap-byos" + sles-15-6-sap-byos: + project: "suse-byos-cloud" + family: "sles-15-sp6-sap-byos" sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: @@ -380,16 +429,31 @@ sap_vm_provision_gcp_ce_vm_host_specifications_dictionary: sap_vm_provision_ibmcloud_vs_host_os_image_dictionary: rhel-8-4: ".*redhat.*8-4.*minimal.*amd64.*" rhel-8-6: ".*redhat.*8-6.*minimal.*amd64.*" + rhel-8-8: ".*redhat.*8-8.*minimal.*amd64.*" + rhel-8-10: ".*redhat.*8-10.*minimal.*amd64.*" rhel-9-0: ".*redhat.*9-0.*minimal.*amd64.*" rhel-9-2: ".*redhat.*9-2.*minimal.*amd64.*" + rhel-9-4: ".*redhat.*9-4.*minimal.*amd64.*" + sles-15-5: ".*sles.*15-5.*amd64-[0-9]" + sles-15-6: ".*sles.*15-6.*amd64-[0-9]" + # rhel-7-6-sap-ha: ".*redhat.*7-6.*amd64.*hana.*" # retrievable from deprecated list + # rhel-7-9-sap-ha: ".*redhat.*7-9.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-1-sap-ha: ".*redhat.*8-1.*amd64.*hana.*" # retrievable from deprecated list + # rhel-8-2-sap-ha: ".*redhat.*8-2.*amd64.*hana.*" # retrievable from deprecated list rhel-8-4-sap-ha: ".*redhat.*8-4.*amd64.*hana.*" rhel-8-6-sap-ha: ".*redhat.*8-6.*amd64.*hana.*" rhel-8-8-sap-ha: ".*redhat.*8-8.*amd64.*hana.*" + rhel-8-10-sap-ha: ".*redhat.*8-10.*amd64.*hana.*" rhel-9-0-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" - rhel-9-2-sap-ha: ".*redhat.*9-0.*amd64.*hana.*" + rhel-9-2-sap-ha: ".*redhat.*9-2.*amd64.*hana.*" + rhel-9-4-sap-ha: ".*redhat.*9-4.*amd64.*hana.*" + # sles-12-4-sap-ha: ".*sles.*12-4.*amd64.*hana.*" # retrievable from deprecated list + # sles-12-5-sap-ha: ".*sles.*12-5.*amd64.*hana.*" # retrievable from deprecated list + # sles-15-1-sap-ha: ".*sles.*15-1.*amd64.*hana.*" # retrievable from deprecated list sles-15-3-sap-ha: ".*sles.*15-3.*amd64.*hana.*" sles-15-4-sap-ha: ".*sles.*15-4.*amd64.*hana.*" sles-15-5-sap-ha: ".*sles.*15-5.*amd64.*hana.*" + sles-15-6-sap-ha: ".*sles.*15-6.*amd64.*hana.*" sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: @@ -434,17 +498,26 @@ sap_vm_provision_ibmcloud_vs_host_specifications_dictionary: # Full Linux subscription ppc64le OS Images with support and activation keys sap_vm_provision_ibmcloud_powervs_host_os_image_dictionary: - rhel-8-4: ".*RHEL.*8.*4" - rhel-8-6: ".*RHEL.*8.*6" + rhel-8-8: ".*RHEL.*8.*8" rhel-9-2: ".*RHEL.*9.*2" - sles-15-3: ".*SLES.*15.*3" - sles-15-4: ".*SLES.*15.*4" + rhel-9-4: ".*RHEL.*9.*4" + sles-15-5: ".*SLES.*15.*5$" + rhel-8-4-sap-ha: "RHEL8-SP4-SAP" rhel-8-6-sap-ha: ".*RHEL.*8.*6.*SAP$" # ensure string suffix using $ rhel-8-8-sap-ha: ".*RHEL.*8.*8.*SAP$" # ensure string suffix using $ rhel-9-2-sap-ha: ".*RHEL.*9.*2.*SAP$" # ensure string suffix using $ sles-15-2-sap-ha: ".*SLES.*15.*2.*SAP$" # ensure string suffix using $ sles-15-3-sap-ha: ".*SLES.*15.*3.*SAP$" # ensure string suffix using $ sles-15-4-sap-ha: ".*SLES.*15.*4.*SAP$" # ensure string suffix using $ + sles-15-5-sap-ha: "SLES15-SP5-SAP" + # rhel-8-4-sap-ha-byol: "RHEL8-SP4-SAP-BYOL" + # rhel-8-6-sap-ha-byol: ".*RHEL.*8.*6.*SAP-BYOL$" # ensure string suffix using $ + # rhel-8-8-sap-ha-byol: ".*RHEL.*8.*8.*SAP-BYOL$" # ensure string suffix using $ + # rhel-9-2-sap-ha-byol: ".*RHEL.*9.*2.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-2-sap-ha-byol: ".*SLES.*15.*2.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-3-sap-ha-byol: ".*SLES.*15.*3.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-4-sap-ha-byol: ".*SLES.*15.*4.*SAP-BYOL$" # ensure string suffix using $ + # sles-15-5-sap-ha-byol: "SLES15-SP5-SAP-BYOL" sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: @@ -481,7 +554,7 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: - name: swap # hdb swap_path: /swapfile # use swap file on root disk, instead of creating LVM LV for swap disk_size: 2 - disk_type: tier3 + disk_type: tier1 filesystem_type: swap # must be swap filesystem - name: software @@ -497,96 +570,186 @@ sap_vm_provision_ibmcloud_powervs_host_specifications_dictionary: #### sap_vm_provision_msazure_vm_host_os_image_dictionary: - + rhel-8-0: + publisher: "RedHat" + offer: "RHEL" + sku: "8-gen2" + rhel-8-1: + publisher: "RedHat" + offer: "RHEL" + sku: "81-gen2" + rhel-8-2: + publisher: "RedHat" + offer: "RHEL" + sku: "82-gen2" + rhel-8-3: + publisher: "RedHat" + offer: "RHEL" + sku: "83-gen2" rhel-8-4: publisher: "RedHat" offer: "RHEL" sku: "84-gen2" - + rhel-8-5: + publisher: "RedHat" + offer: "RHEL" + sku: "85-gen2" + rhel-8-6: + publisher: "RedHat" + offer: "RHEL" + sku: "86-gen2" + rhel-8-7: + publisher: "RedHat" + offer: "RHEL" + sku: "87-gen2" + rhel-8-8: + publisher: "RedHat" + offer: "RHEL" + sku: "88-gen2" + rhel-8-9: + publisher: "RedHat" + offer: "RHEL" + sku: "89-gen2" + rhel-8-10: + publisher: "RedHat" + offer: "RHEL" + sku: "810-gen2" + rhel-9-0: + publisher: "RedHat" + offer: "RHEL" + sku: "90-gen2" + rhel-9-1: + publisher: "RedHat" + offer: "RHEL" + sku: "91-gen2" + rhel-9-2: + publisher: "RedHat" + offer: "RHEL" + sku: "92-gen2" + rhel-9-3: + publisher: "RedHat" + offer: "RHEL" + sku: "93-gen2" + rhel-9-4: + publisher: "RedHat" + offer: "RHEL" + sku: "94-gen2" + sles-12-5: + publisher: "SUSE" + offer: "sles-12-sp5" + sku: "gen2" + sles-15-1: + publisher: "SUSE" + offer: "sles-15-sp1" + sku: "gen2" + sles-15-2: + publisher: "SUSE" + offer: "sles-15-sp2" + sku: "gen2" + sles-15-3: + publisher: "SUSE" + offer: "sles-15-sp3" + sku: "gen2" + sles-15-4: + publisher: "SUSE" + offer: "sles-15-sp4" + sku: "gen2" + sles-15-5: + publisher: "SUSE" + offer: "sles-15-sp5" + sku: "gen2" + sles-15-6: + publisher: "SUSE" + offer: "sles-15-sp6" + sku: "gen2" rhel-8-1-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "81sapha-gen2" - rhel-8-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "82sapha-gen2" - rhel-8-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "84sapha-gen2" - rhel-8-6-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "86sapha-gen2" - rhel-8-8-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "88sapha-gen2" - + rhel-8-10-sap-ha: + publisher: "RedHat" + offer: "RHEL-SAP-HA" + sku: "810sapha-gen2" rhel-9-0-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "90sapha-gen2" - rhel-9-2-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" sku: "92sapha-gen2" - - rhel-8-1-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "81sapapps-gen2" - - rhel-8-2-sap-applications: + rhel-9-4-sap-ha: publisher: "RedHat" offer: "RHEL-SAP-HA" - sku: "82sapapps-gen2" - - rhel-8-4-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-HA" - sku: "84sapapps-gen2" - - rhel-8-6-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "86sapapps-gen2" - - rhel-8-8-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "88sapapps-gen2" - - rhel-9-0-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "90sapapps-gen2" - - rhel-9-2-sap-applications: - publisher: "RedHat" - offer: "RHEL-SAP-applications" - sku: "92sapapps-gen2" - - sles-15-sp3-sap: + sku: "94sapha-gen2" + sles-12-5-sap-ha: + publisher: "SUSE" + offer: "sles-sap-12-sp5" + sku: "gen2" + sles-15-1-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp1" + sku: "gen2" + sles-15-2-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp2" + sku: "gen2" + sles-15-3-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp3" sku: "gen2" - - sles-15-sp4-sap: + sles-15-4-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp4" sku: "gen2" - - sles-15-sp5-sap: + sles-15-5-sap-ha: publisher: "SUSE" offer: "sles-sap-15-sp5" sku: "gen2" + sles-15-6-sap-ha: + publisher: "SUSE" + offer: "sles-sap-15-sp6" + sku: "gen2" + sles-15-1-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp1-byos" + sku: "gen2" + sles-15-2-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp2-byos" + sku: "gen2" + sles-15-3-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp3-byos" + sku: "gen2" + sles-15-4-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp4-byos" + sku: "gen2" + sles-15-5-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp5-byos" + sku: "gen2" + sles-15-6-sap-byos: + publisher: "SUSE" + offer: "sles-sap-15-sp6-byos" + sku: "gen2" sap_vm_provision_msazure_vm_host_specifications_dictionary: diff --git a/special_actions/sap_webdispatcher_standalone/ansible_requirements.yml b/special_actions/sap_webdispatcher_standalone/ansible_requirements.yml index af7ed22..1454ec5 100644 --- a/special_actions/sap_webdispatcher_standalone/ansible_requirements.yml +++ b/special_actions/sap_webdispatcher_standalone/ansible_requirements.yml @@ -8,16 +8,16 @@ collections: version: 6.1.0 - name: fedora.linux_system_roles type: galaxy - version: 1.82.0 + version: 1.88.9 - name: community.sap_install type: galaxy - version: 1.4.0 + version: 1.5.0 - name: community.sap_launchpad type: galaxy - version: 1.1.0 + version: 1.1.1 - name: community.sap_infrastructure type: galaxy - version: 1.0.1 + version: 1.1.0 # - name: community.sap_operations # type: galaxy # version: 0.9.1 @@ -25,23 +25,23 @@ collections: # Collections for Infrastructure from Ansible Galaxy - name: cloud.terraform type: galaxy - version: 1.1.0 + version: 3.0.0 - name: amazon.aws type: galaxy - version: 7.2.0 + version: 9.0.0 - name: community.aws type: galaxy - version: 7.1.0 + version: 9.0.0 - name: azure.azcollection type: galaxy - version: 2.2.0 + version: 3.0.1 - name: google.cloud type: galaxy version: 1.1.3 # Replace with ibm.cloud in future, legacy Ansible Collection uses hidden on-the-fly Terraform files in /var/tmp/ansible/ibmcloud) - name: ibm.cloudcollection type: galaxy - version: 1.51.0 + version: 1.71.2 - name: ovirt.ovirt type: galaxy version: 3.1.2 @@ -53,21 +53,12 @@ collections: version: 3.0.0 - name: cloud.common type: galaxy - version: 3.0.0 + version: 4.0.0 # Collections from public repositories via HTTPS # - name: https://github.com/sap-linuxlab/community.sap_install.git # type: git # version: dev -# - name: https://github.com/sap-linuxlab/community.sap_launchpad.git -# type: git -# version: main -# - name: https://github.com/sap-linuxlab/community.sap_operations.git -# type: git -# version: main -# - name: https://github.com/ansible-collections/cloud.terraform.git -# type: git -# version: main # Collections from private repositories via use SSH (embedded GitHub PAT does not work) # Used for customised/forked Ansible Collections diff --git a/special_actions/sap_webdispatcher_standalone/optional/ansible_extravars_noninteractive.yml b/special_actions/sap_webdispatcher_standalone/optional/ansible_extravars_noninteractive.yml index 3f25abe..a10d6cd 100755 --- a/special_actions/sap_webdispatcher_standalone/optional/ansible_extravars_noninteractive.yml +++ b/special_actions/sap_webdispatcher_standalone/optional/ansible_extravars_noninteractive.yml @@ -139,6 +139,7 @@ sap_vm_provision_bastion_public_ip: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ssh_bastion_private_key_file_path: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ssh_host_private_key_file_path: "ENTER_STRING_VALUE_HERE" sap_vm_provision_ibmcloud_powervs_key_pair_name_ssh_host_public_key: "ENTER_STRING_VALUE_HERE" +sap_vm_provision_ibmcloud_private_dns_custom_resolver_ip: "ENTER_STRING_VALUE_HERE" # sap_vm_provision_ibmcloud_private_dns_resource_group_name: "" # optional, default use of sap_vm_provision_ibmcloud_resource_group_name sap_vm_provision_proxy_web_forward_proxy_ip: "ENTER_STRING_VALUE_HERE" # IP:Port only, no http:// prefix sap_vm_provision_proxy_web_forward_exclusions: "localhost,127.0.0.1,{{ sap_vm_provision_dns_root_domain }}"