Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

sap_swpm: changes for s4hana java #707

Merged
merged 2 commits into from
May 3, 2024
Merged

sap_swpm: changes for s4hana java #707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
454d369
sap_swpm: changes for s4hana java
sean-freeman Apr 15, 2024
b2bbdf5
sap_swpm: comment out java pkg params
sean-freeman Apr 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion playbooks/vars/sample-variables-sap-swpm-default-mode-solman-hana-abap-onehost-install.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ sap_swpm_inifile_list:
- nw_config_java_ume
- nw_config_host_agent
- sap_os_linux_user
- solman_credentials_swpm1
- nw_config_java_icm_credentials
- solman_abap_swpm1

# Software
Expand Down
2 changes: 1 addition & 1 deletion playbooks/vars/sample-variables-sap-swpm-default-mode-solman-hana-java-onehost-install.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ sap_swpm_inifile_list:
- 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:
Expand Down
20 changes: 16 additions & 4 deletions roles/sap_swpm/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ sap_swpm_inifile_list:
- nw_config_ports
# - nw_config_java_ume
# - nw_config_java_feature_template_ids
# - nw_config_java_icm_credentials
# - nw_config_webdisp_generic
# - nw_config_webdisp_gateway
- nw_config_host_agent
Expand All @@ -126,7 +127,6 @@ sap_swpm_inifile_list:

## Not in use
# - swpm_installation_media_download_service
# - solman_credentials_swpm1
# - solman_abap_swpm1
# - solman_daa_swpm1

Expand Down Expand Up @@ -229,11 +229,15 @@ sap_swpm_virtual_hostname: "initial"
########################################
# SWPM Ansible Role variables
# for Default Mode
# - Lookup list of Feature Template IDs
# - Lookup list of NWAS JAVA Feature Template IDs
########################################

sap_swpm_java_template_id_selected_list:
- java_engine_ee
# Two methods exist for SAP NWAS JAVA, jload and extramile (BatchDeployer) before call to Deploy Controller Runner
# Default to extramile for SAP NWAS JAVA, except SAP S/4HANA
sap_swpm_java_import_method: "{{ 'jload' if 'S4H' in sap_swpm_product_catalog_id else 'extramile' }}"

# Use empty list which will create inifile parameter as blank for default installation
sap_swpm_java_template_id_selected_list: []

sap_swpm_java_template_id_lookup_dictionary:
java_nwas_as:
Expand Down Expand Up @@ -270,6 +274,14 @@ sap_swpm_java_template_id_lookup_dictionary:
- 01200615324800001035 # Solution Manager, includes java_nwas_as (01200615324800000135) and java_engine_ee (01200615324800000125)
java_demo:
- 01200615324800002898 # Demo Applications
s4hana_java_as:
- '73554900104800002396' # SAP S/4HANA Java
s4hana_java_adobe_document_services:
- '73554900104800002328' # SAP S/4HANA Java Adobe Document Services, includes s4hana_java_as (73554900104800002396)
s4hana_java_enterprise_service_repository:
- '73554900104800002330' # SAP S/4HANA Java Enterprise Services Repository, includes s4hana_java_as (73554900104800002396)
s4hana_java_aex:
- '73554900104800002329' # SAP S/4HANA Java Advanced Adapter Engine Extnd, includes s4hana_java_as (73554900104800002396) and s4hana_java_enterprise_service_repository (73554900104800002330)


########################################
Expand Down
14 changes: 10 additions & 4 deletions roles/sap_swpm/templates/configfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,13 @@ SAPINST.CD.PACKAGE.RDBMS = {{ sap_swpm_cd_rdbms_path }}
# SAPINST.CD.PACKAGE.KERNEL =
# SAPINST.CD.PACKAGE.KERNEL2 =
# SAPINST.CD.PACKAGE.KERNEL3 =

# SAPINST.CD.PACKAGE.JAVA_EXPORT = /path/JAVA_EXPORT
# SAPINST.CD.PACKAGE.JDMP = /path/JAVA_EXPORT_JDMP
# SAPINST.CD.PACKAGE.J2EE = /path/JAVA_J2EE_OSINDEP
# SAPINST.CD.PACKAGE.J2EE-INST = /path/JAVA_J2EE_OSINDEP_J2EE_INST
# SAPINST.CD.PACKAGE.SCA = /path/JAVA_J2EE_OSINDEP_UT

{% endif %}

{% if 'swpm_installation_media_swpm1_exportfiles' in sap_swpm_inifile_list %}
Expand Down Expand Up @@ -638,7 +645,7 @@ UmeConfiguration.umeType = {{ sap_swpm_ume_type }}
# nw_config_java_feature_template_ids
######
NW_internal.useProductVersionDescriptor = true
nw_java_import.buildJEEusingExtraMileTool = true
nw_java_import.buildJEEusingExtraMileTool = {{ true if sap_swpm_java_import_method == 'extramile' else false }}

# If use PV = true
# SAP SWPM 1.0 for SAP NetWeaver AS (JAVA), Product Version Software Instance **Feature Template IDs** comma-separated list
Expand Down Expand Up @@ -802,10 +809,9 @@ nwUsers.sidAdmUID = {{ sap_swpm_sidadm_uid }}
{% endif %}


{% if 'solman_credentials_swpm1' in sap_swpm_inifile_list %}
{% if 'nw_config_java_icm_credentials' in sap_swpm_inifile_list %}
######
# solman_credentials_swpm1
# Not in use by sap_swpm Ansible Role
# nw_config_java_icm_credentials
######
NW_IcmAuth.webadmPassword = {{ sap_swpm_ume_j2ee_admin_password }}
{% endif %}
Expand Down
Loading